am 277dafd0: am 5c015d2b: Merge "Use EditText for search in ActionBar"

* commit '277dafd012b2499be0a775fce24f5e3f5b6a0efe':
tree: c2175942e3a631ad112fe6ab17da560c45fc1ae2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags