| commit | 6d97667678e4397561a920f60e2655feb44fb48b | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Thu Aug 27 21:31:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:31:47 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 2d637dc5fc799878704cbb53248b2954ed5d28c1 [diff] | |
| parent | 0dd5372147e6dafb0c0f54e90105bff7aed0b300 [diff] |
am 0dd53721: am 48080676: (-s ours) am 03ec018a: am 30ade916: Merge "Support for aged permissions" into studio-1.4-dev automerge: 604fceb automerge: 4212528 * commit '0dd5372147e6dafb0c0f54e90105bff7aed0b300':