commit | 098777d73584d75651b97051a440e667cf06266c | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 01:37:25 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 01:37:25 2017 +0000 |
tree | 70c36e82763ceed6d3ee0482e40f8c7dfcc47434 | |
parent | f122300f2d3928e0693823ef56bec2e896558cc1 [diff] | |
parent | 0387fd89f2c5ce06c97db0813b8f85a6dc4665be [diff] |
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours am: 43f79eec8b am: cecf30c3a2 am: 5a50d2b12c am: 34df10ec98 am: 0387fd89f2 Change-Id: Ibeb32d154565051af7e7268e7ef2485ad785c336