commit | d96c17f7dffd7648c1b379cf4a3e5265a66b287e | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 01:30:04 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 01:30:04 2017 +0000 |
tree | 00f81f074c4fc57d6dfde54ebc18a3dc27b5e140 | |
parent | 7b2985bc9e1de988b2c0179772245de0b78cb9d7 [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: I23fe0c7c446c3c2ed0570606a4ac9860df866295