am b9770cb7: Merge "Add device form factor to KeyboardId" into jb-mr1-dev

* commit 'b9770cb7f7b6d51b651a60d753949208a9742974':
  Add device form factor to KeyboardId
tree: 7c7f21a5c52c481e6f42ea51b6f135079a2a395e
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk