Merge heads

2013-07-03 11:19:22 +08:00
parent 7bee6470bd
commit b4e94b9af1
53 changed files with 135 additions and 60 deletions
@@ -18,6 +18,7 @@ limitations under the License.
  <item
    android:icon="@drawable/menu_map_layer"
    android:orderInCategory="5"
+    android:showAsAction="ifRoom"
    android:title="@string/menu_map_layer">
    <menu>
      <group android:checkableBehavior="single" >