am e5ae8c62: am 1b09ac4f: Merge "Add a showing input method picker option by longpressing setting key" into gingerbread

Merge commit 'e5ae8c62c83ad29d623562a74355bc619c216742'

* commit 'e5ae8c62c83ad29d623562a74355bc619c216742':
  Add a showing input method picker option by longpressing setting key
tree: 477862b4b5d63247e67c6195e39e6286c06280a9
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. Android.mk
  6. CleanSpec.mk