| commit | a19958d052133e4bcccb352e53586b535c09b0cd | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Fri Feb 03 01:45:55 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 01:45:55 2017 +0000 |
| tree | aef533a7423ca0fa4e494d170e0b5556ae831606 | |
| parent | b20f9a80d63a39f714dc0a773993e19a916f347d [diff] | |
| parent | f6fa670588f8311714e4791c53ef348d310a0a3e [diff] |
Merge "DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours am: cdb996355e am: d2a9d6fa27 am: 8d9953964a am: 8c23d1aadb am: b93bc585f0" into nyc-mr2-dev-plus-aosp am: f6fa670588 -s ours Change-Id: Idae546a67614dff9ecaf59443ad5dc8c61cdd03f