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