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

* commit '5c015d2b8bef04a91463470563ec28eb20892064':
  Use EditText for search in ActionBar
tree: 399c625783d63c4d4aeb13b1cdcca9283e28ce01
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags