am a024ac6b: Merge "Fix an NPE"

* commit 'a024ac6b206316a96d472d4e2dd3ef1a22e05eac':
  Fix an NPE
tree: 8cd75d42e0d4f366fbb4ece908a34df07137c5d2
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk