Merge "Fix NPE when context.getFilesDir() returns null." into lmp-dev
tree: d616b29ada75a477681377c1e5fdfbe5bd6e9bcd
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk