am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '0849a4b9b7dc4e37993ca59cab1db8b43f0d456c':
  Prevent keyboard A11y proxy from referencing a null keyboard view.
tree: 3b26539f8da87a19c8d0e597168c1e9baafdd2ad
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk