tree 759ec10294fe0deadb348c85041abb142ceeb58b
parent 1ac6519b245c008ea6b3b6baba205fb58d75c807
parent d10b65431547d66b41e4e282e9261453bb0658ff
author Ricardo Cervera <rcervera@google.com> 1396633731 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396633731 +0000

am d10b6543: am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs

* commit 'd10b65431547d66b41e4e282e9261453bb0658ff':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053