commit | 4a11140df3c156a98a0e1518fd3f542c5e9f5a93 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 00:56:19 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 00:56:19 2017 +0000 |
tree | dd12e386df66059cac6c17f98bb63dddd96d130c | |
parent | 758dede2d8e8c4785e04e0eea94c9f5f3be51317 [diff] | |
parent | 1e9b978dc794d5bb1adeb40ab0fb93ba4113b745 [diff] |
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41 -s ours am: f68199a472 am: a7388f1ed4 am: 7a6bd686a3 am: 1e9b978dc7 Change-Id: I665006f7ec40f409489bfdfa586cab9dfd0222e6