commit | 06b98e6b3cb46b99f9dd0771a5069fb08afed9e1 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 00:34:00 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 00:34:00 2017 +0000 |
tree | fec2c72a0de19d85271d531b0db5194861c499c1 | |
parent | 1007b773b92322fe6a12d3fbda5d70cf455b5c06 [diff] | |
parent | 33cd012e569bc860568b1374cf0650a58cca7259 [diff] |
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours am: 0e09e8c201 am: 33cd012e56 Change-Id: I8444b378a3554ded73e914e332c55e4e0ce36098