Merge heads

2013-07-10 14:19:41 +08:00
parent fd3940fcd0
commit 4debca0054
220 changed files with 359 additions and 293 deletions
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
  <item
-    android:icon="@drawable/menu_map_layer"
+    android:icon="@drawable/ic_menu_map_layer"
    android:orderInCategory="5"
    android:showAsAction="ifRoom"
    android:title="@string/menu_map_layer">