commit | d4adaada5578eabe8c9b18d520c39f0398e35008 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 01:32:11 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 01:32:11 2017 +0000 |
tree | 00f81f074c4fc57d6dfde54ebc18a3dc27b5e140 | |
parent | 1d5d7d1a5f1ccb3289d6521cc0f04d07479b8f27 [diff] | |
parent | 1eb2ded281e7a95a25f236f1087ca4ed51969500 [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 Change-Id: I7ceae022988bc333631cd83eed868ae573096bb4