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

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