tree f14f296393f8bb59d3d15b818792ca56f4dfd24d
parent 715139a620383c89e061a2b0650e184bf3382a10
parent 90a5f9851ad778a7ce8e06b20f137d2d47e829e6
author Ricardo Cervera <rcervera@google.com> 1396632777 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1396632777 +0000

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