tree 3cc21db56b7ee6c623317c53822e6668d8d6f8e5
parent c31bd52df22dabf52b50e1377878548607d1f07b
parent 5df825237afd016c48dd3577d839825e5161d3e7
author Ricardo Cervera <rcervera@google.com> 1396633364 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396633364 +0000

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

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