OSDN Git Service

am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev
authorAndrew Solovay <asolovay@google.com>
Mon, 17 Aug 2015 17:36:25 +0000 (17:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Aug 2015 17:36:25 +0000 (17:36 +0000)
commitad7d95bdcf849d9a13c0ff021beb1c7692e419ea
tree92b998dcee062c22e02a2eba719b6ec485a9bbf2
parentdbfa65ddb2b76b49541d5d084c32d5fc7f8f141b
parentaf46e1b404c1d4fea17a24e5a49f23a7d0c982f7
am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev

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