commit | f77ab9648cf587a135d147b708e4afc7f8832c98 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 01:48:07 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 01:48:07 2017 +0000 |
tree | 70c36e82763ceed6d3ee0482e40f8c7dfcc47434 | |
parent | 3d95a03d64b9826ca2d94094a6acb8dc3480179e [diff] | |
parent | e8895e868ebda53693cbeb23ead70e0aaccc7a9c [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 am: e8895e868e Change-Id: I9e9e577da682a8e8866c5de52123432bc78541f4