commit | 94f51c99e38a4256448139dca61db070b508e453 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 01:44:16 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 01:44:16 2017 +0000 |
tree | 70c36e82763ceed6d3ee0482e40f8c7dfcc47434 | |
parent | 85e0241626905a25c05ea1a3bca59d27179619fd [diff] | |
parent | d96c17f7dffd7648c1b379cf4a3e5265a66b287e [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: d96c17f7df Change-Id: I9cf473c9a4e756e5265064cb534fd34c4dfc595a