tree 8669f085a2d9d6716e3761db244263266e2e5093
parent a821af684e2a5f814fc8709518b5f0589c81661e
parent ff3d89c08cd69c506ea07fb30a58f88e188b2dd9
author Ricardo Cervera <rcervera@google.com> 1396633139 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396633139 +0000

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

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