commit | e03ca16d1bf71ba453126bbd6d5ee8c5cb6a46e8 | [log] [tgz] |
---|---|---|
author | Andrew Solovay <asolovay@google.com> | Mon Aug 17 18:55:04 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 17 18:55:04 2015 +0000 |
tree | d5890c131167847bc98793240957e5601198b3ce | |
parent | 6f4f94ae60129be8052ae3b1c4fd9b83a4729073 [diff] | |
parent | 8552b77c6f68d67f7bf55d3f8c10039a8e9ca4fb [diff] |
am 8552b77c: am f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts for merge of 44053b4e to mnc-dev * commit '8552b77c6f68d67f7bf55d3f8c10039a8e9ca4fb': docs: Updating the permissions docs for Preview 3.