am 10800d4b: am a024ac6b: Merge "Fix an NPE"

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