Merge "Bug fixes for new search ui w/ Dialpad."
am: f09b9f8f65

Change-Id: I7454b7935316e7110391736c616368df33669cbe
tree: 161081e70741a8136de36a58fc4416084c87e289
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE