am 7ed6b88c: am a0a60b37: Revert changes to keyboard_popup.xml for now.

Merge commit '7ed6b88cf6f090512953e3665e4ff5072c98560b'

* commit '7ed6b88cf6f090512953e3665e4ff5072c98560b':
  Revert changes to keyboard_popup.xml for now.
tree: 7e50e8cc7c40c633f818253f13ed4cb825cd2f02
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. Android.mk
  6. CleanSpec.mk