Merge "Bug fixes for new search ui w/ Dialpad." am: f09b9f8f65 am: df94395766 am: 828e877622
am: 8ffcf54f76

Change-Id: I235f9ff4e13b2b76fe714612718aaa510e425899
tree: 2e44d1f85fcd7398419bc84316e6b11925192ffd
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. LICENSE