| commit | 70ed66ce6c236303d4784f768a73fb512e8ae902 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 01:36:53 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 01:36:53 2017 +0000 |
| tree | 70c36e82763ceed6d3ee0482e40f8c7dfcc47434 | |
| parent | 1834734eefee940e7769d67916b35a679f192653 [diff] | |
| parent | af86efd70d4c0668b24ebc0db70fa0dc4632b998 [diff] |
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6 am: 609145c315 am: af86efd70d Change-Id: I4c4b40569545c26adc8f3f4b8c82ac6525f89b22