commit | 8c9ff68173cecda5f0b68a2bde475202c005ecca | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 00:33:40 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 00:33:40 2017 +0000 |
tree | c415213d66999f55080104facd973beeb8dde6ac | |
parent | bd2bec9164b98a98cf16674f60d1ee7ad01fac1b [diff] | |
parent | f82c3730748893ac1e9ff5fe7353fa110e8d7ef4 [diff] |
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 Change-Id: I603a9a75c3874f1b7cf099aa26b865fdbe7b0e99