am aad3cb80: (-s ours) am ade16493: Merge "Include horizontal and vertical gap in the count of Key.isOnKey" into honeycomb-mr2

* commit 'aad3cb8059a295f15c45680e3fb0eba96b4436c5':
  Include horizontal and vertical gap in the count of Key.isOnKey
tree: 263b4a9ef75c661661dbd99c835ffd9e0b5bd2df
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk