| commit | 0fe739f184b5665c8735cc65776f8aa14993d7ee | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Fri Feb 03 01:56:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 01:56:46 2017 +0000 |
| tree | aef533a7423ca0fa4e494d170e0b5556ae831606 | |
| parent | 9f09ba4043d49bf89cb85ca3a316f073af0edd24 [diff] | |
| parent | 6328cc234a90288f1dc4bfa2c8dc17bba2f3b8f1 [diff] |
Merge "DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe am: e25ab62f5b am: cc17b28c0c" into nyc-mr2-dev-plus-aosp am: 6328cc234a -s ours Change-Id: I7608c1071c08ff822419f5cc2427b8fcb2b52e5f