merge heads

This commit is contained in:
Jimmy Shih
2012-05-01 18:05:53 -07:00
parent 52253afd3a
commit 66ba54ffa0
113 changed files with 1122 additions and 1956 deletions
+3 -3
View File
@@ -18,16 +18,16 @@ limitations under the License.
<item
android:icon="@drawable/menu_show_on_map"
android:id="@+id/list_context_menu_show_on_map"
android:showAsAction="always"
android:showAsAction="ifRoom"
android:title="@string/menu_show_on_map"/>
<item
android:icon="@drawable/menu_edit"
android:id="@+id/list_context_menu_edit"
android:showAsAction="always"
android:showAsAction="ifRoom"
android:title="@string/menu_edit"/>
<item
android:icon="@drawable/menu_delete"
android:id="@+id/list_context_menu_delete"
android:showAsAction="always"
android:showAsAction="ifRoom"
android:title="@string/menu_delete"/>
</menu>