tree d1371f8c38f5c6444409e61b33e7842f524350c0
parent 35dec44394358bac2cdf31d5e8377687a1723476
parent 8f81d29558bb0c97187d5ae3a7ee696ec13b264a
author Ricardo Cervera <rcervera@google.com> 1396634145 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396634145 +0000

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

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