merge heads

2012-03-20 10:23:19 -07:00
parent 1893c3557d
commit 08a17a58ef
21 changed files with 640 additions and 377 deletions
@@ -15,9 +15,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-  <item android:id="@+id/menu_search"
+
+  <item
    android:icon="@android:drawable/ic_menu_search"
-    android:title="@string/menu_search"
+    android:id="@+id/menu_search"
    android:onClick="onSearch"
-    android:showAsAction="always" />
+    android:showAsAction="always"
+    android:title="@string/menu_search"/>
+
 </menu>