merge heads

2012-03-22 12:12:14 -07:00
parent 3044a1daea
commit 0bd4461c32
3 changed files with 21 additions and 12 deletions
@@ -15,12 +15,9 @@ 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:icon="@android:drawable/ic_menu_search"
    android:id="@+id/menu_search"
-    android:onClick="onSearch"
    android:showAsAction="always"
    android:title="@string/menu_search"/>
-
 </menu>