OSDN Git Service

am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev
authorAndrew Solovay <asolovay@google.com>
Mon, 17 Aug 2015 17:35:05 +0000 (17:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Aug 2015 17:35:05 +0000 (17:35 +0000)
commita8f68d2da7733673d25fd1e5573539bf29b71ee4
tree77dac93215568648d22598dd7b9ce71ad46e6752
parentc57f309a1b5be6fe9156405feb48637c036880a4
parentaf46e1b404c1d4fea17a24e5a49f23a7d0c982f7
am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev

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