| commit | a50c80c23ea1fdde5be190f1d9352dfcd4ccf798 | [log] [tgz] |
|---|---|---|
| author | Andrew Solovay <asolovay@google.com> | Mon Aug 17 19:07:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 17 19:07:25 2015 +0000 |
| tree | f9321e2105679dc7783c009fcbe8b0564b876b4d | |
| parent | 4d25a1d914204cd8dd71aee21989325678916696 [diff] | |
| parent | e03ca16d1bf71ba453126bbd6d5ee8c5cb6a46e8 [diff] |
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.