am 0bad998c: am fb15b768: Merge "Fix NPE when context.getFilesDir() returns null." into lmp-dev

* commit '0bad998c52cc0ed610e4fef745c438472f14a7e4':
main
Keisuke Kuroyanagi 2015-03-20 23:19:57 +00:00 committed by Android Git Automerger
commit c6e3327f88

Diff Content Not Available