commit | 0792846ea58e136d9bcd471189e5e446e25ddb6f | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 01:28:54 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 01:28:54 2017 +0000 |
tree | dd12e386df66059cac6c17f98bb63dddd96d130c | |
parent | b93bc585f0915b809de300d5611b3fe08382dbdb [diff] | |
parent | ce15555148eb0868dda2cc3db597a3818199e119 [diff] |
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd am: ce15555148 Change-Id: Iae6d62ce80959214aac7299ff1077a54d69e03b5