Merge heads

This commit is contained in:
youtaol
2013-07-10 14:19:41 +08:00
parent fd3940fcd0
commit 4debca0054
220 changed files with 359 additions and 293 deletions
+3 -3
View File
@@ -16,17 +16,17 @@ limitations under the License.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:icon="@drawable/menu_show_on_map"
android:icon="@drawable/ic_menu_show_on_map"
android:id="@+id/marker_detail_show_on_map"
android:showAsAction="ifRoom"
android:title="@string/menu_show_on_map"/>
<item
android:icon="@drawable/menu_edit"
android:icon="@drawable/ic_menu_edit"
android:id="@+id/marker_detail_edit"
android:showAsAction="ifRoom"
android:title="@string/menu_edit"/>
<item
android:icon="@drawable/menu_delete"
android:icon="@drawable/ic_menu_delete"
android:id="@+id/marker_detail_delete"
android:showAsAction="ifRoom"
android:title="@string/menu_delete"/>