| commit | 626d56f2bfef4af55fc7a998595c396a8f4ca124 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 01:27:32 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 01:27:32 2017 +0000 |
| tree | 00f81f074c4fc57d6dfde54ebc18a3dc27b5e140 | |
| parent | 030e74a380be683b9bade563b57429c8801ae411 [diff] | |
| parent | 76ce0386dbd45bab4c6ef6785f79c405ca9f1af1 [diff] |
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours am: 0e09e8c201 am: 33cd012e56 am: 06b98e6b3c am: 76ce0386db Change-Id: I1a5282c25eba331df935ab2863c33406e8b694fb