merge heads

2012-04-02 14:49:12 -07:00
parent 0bd4461c32
commit 2d05ff98ca
75 changed files with 783 additions and 794 deletions
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
  <item
-    android:icon="@android:drawable/ic_menu_search"
+    android:icon="@drawable/menu_search"
    android:id="@+id/menu_search"
    android:showAsAction="always"
    android:title="@string/menu_search"/>