Merge heads

2013-08-15 09:46:14 +08:00
parent 4d8c44782e
commit d64b6a4d93
30 changed files with 785 additions and 189 deletions
@@ -17,7 +17,7 @@ limitations under the License.
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
  <item
    android:icon="@drawable/ic_menu_map_layer"
-    android:orderInCategory="5"
+    android:orderInCategory="6"
    android:showAsAction="ifRoom"
    android:title="@string/menu_map_layer">
    <menu>