commit | 1e9b978dc794d5bb1adeb40ab0fb93ba4113b745 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 00:51:19 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 00:51:19 2017 +0000 |
tree | a0cbbd8572e2db353cd29f719ea826a43b8ec9e3 | |
parent | 2e3a27717541dcb518d610393bf618b57254d84d [diff] | |
parent | 7a6bd686a37e4864f30f84ef0a5a49ef9ddd06c1 [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 Change-Id: I30d3bad3c7c6e6779d5c2b964ae4aa5b68b82bbd