am 96263321: (-s ours) am 3d20d999: Specify keyboard metrics with physical unit "inch" (DO NOT MERGE)

Merge commit '96263321b52e1ef1dcba126ae525b7f4abc3c5e9'

* commit '96263321b52e1ef1dcba126ae525b7f4abc3c5e9':
  Specify keyboard metrics with physical unit "inch" (DO NOT MERGE)
tree: 7cec0e718ac7692e8dd684fc32579ea32687765b
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. Android.mk
  6. CleanSpec.mk