| commit | 8258a2f0c385c5e27bc603bb9d94e450a42aca47 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 01:46:04 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 01:46:04 2017 +0000 |
| tree | 70c36e82763ceed6d3ee0482e40f8c7dfcc47434 | |
| parent | 538787f3f0f37a95361d9a990c0ff942dd2a32c7 [diff] | |
| parent | d4adaada5578eabe8c9b18d520c39f0398e35008 [diff] |
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours am: f19cea14cf am: ee958351b7 am: e6060558b3 am: 1eb2ded281 am: d4adaada55 Change-Id: Iaed6747905a26eb292a054dcf00f4fd22f4805fe