am de51abf1: am bfe5c07f: am ededdc6a: Merge "Avoid NPE"

* commit 'de51abf1cfa0aea19d82cae69ea9bad2338d6d3a':
tree: 87fdf0072cee1f3cb3337b4dbb8b234c62edec32
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk