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