am f463b45d: Merge "Fix Possible NPE"

* commit 'f463b45d8e0f6603446496b38aaf45db7e4bb5dd':
  Fix Possible NPE
tree: 30a1b732ab76d30a636e2f2f0557675139787528
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk