| commit | 770eff87cd60110e95971c13ccb25c0be2e3a630 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 01:13:24 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 01:13:24 2017 +0000 |
| tree | fec2c72a0de19d85271d531b0db5194861c499c1 | |
| parent | 8d9953964aaab03f2483ef8136a4d1a5d0ffd4a6 [diff] | |
| parent | 7cd3c47c2900f1c6a7c16c257ce628940fe6eb48 [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 Change-Id: I91895a68c262cce27738b106c6f5d1b75a311b73