am bfe5c07f: am ededdc6a: Merge "Avoid NPE"

* commit 'bfe5c07fda3d24589b1ad16d41c0dafd6651d0ee':
  Avoid NPE
tree: c8acdf7ce56f0a8d7648a619473de3899180e9db
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk