| commit | e7e70b868d10258e57bda6fba87f336c734e15e5 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 01:01:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 01:01:51 2017 +0000 |
| tree | 70c36e82763ceed6d3ee0482e40f8c7dfcc47434 | |
| parent | c3b29074864ceb6789900e9aa9265741962ca013 [diff] | |
| parent | 4a11140df3c156a98a0e1518fd3f542c5e9f5a93 [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 am: 4a11140df3 Change-Id: I5706916619ea4498a6a8b681e57b6a4ee1a0d10d