tree 92b998dcee062c22e02a2eba719b6ec485a9bbf2
parent dbfa65ddb2b76b49541d5d084c32d5fc7f8f141b
parent af46e1b404c1d4fea17a24e5a49f23a7d0c982f7
author Andrew Solovay <asolovay@google.com> 1439832985 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439832985 +0000

am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev

* commit 'af46e1b404c1d4fea17a24e5a49f23a7d0c982f7':
  docs: Updating the permissions docs for Preview 3.