OSDN Git Service

am e03ca16d: am 8552b77c: am f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts...
authorAndrew Solovay <asolovay@google.com>
Mon, 17 Aug 2015 19:07:25 +0000 (19:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Aug 2015 19:07:25 +0000 (19:07 +0000)
commita50c80c23ea1fdde5be190f1d9352dfcd4ccf798
treef9321e2105679dc7783c009fcbe8b0564b876b4d
parent4d25a1d914204cd8dd71aee21989325678916696
parente03ca16d1bf71ba453126bbd6d5ee8c5cb6a46e8
am e03ca16d: am 8552b77c: am f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev

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