Merge "Squash a ridiculously improbable NPE"
tree: 121fd6f6dba89ce1f8578ace8365874967fc0e97
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk