| commit | 79979b2413da4cc34a1878511728c594bd658756 | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Thu Aug 27 21:31:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:31:49 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 6d97667678e4397561a920f60e2655feb44fb48b [diff] | |
| parent | c2687010d8d4cd69b00973eed7c8abe365ca3b28 [diff] |
am c2687010: am 0e755da4: (-s ours) am f499d0a6: am 196030c2: Merge "Update the protection level for a few permissions" into studio-1.4-dev automerge: 63f58c3 automerge: 6af62dc * commit 'c2687010d8d4cd69b00973eed7c8abe365ca3b28':