am bf0172d7: (-s ours) am 179fa2c0: DO NOT MERGE. Add visual indicator that long press , or mic key will bring up Settings

Merge commit 'bf0172d71854bda9a75fb351977eb9d5067eb91e'

* commit 'bf0172d71854bda9a75fb351977eb9d5067eb91e':
  DO NOT MERGE. Add visual indicator that long press , or mic key will bring up Settings
tree: 7cec0e718ac7692e8dd684fc32579ea32687765b
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. Android.mk
  6. CleanSpec.mk