commit | a41406165829843b623175f15a5b1df5bb1e4796 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Feb 03 01:38:00 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Feb 03 01:38:03 2017 +0000 |
tree | 70c36e82763ceed6d3ee0482e40f8c7dfcc47434 | |
parent | 651c9cd390886f8932c7e5a50093ac945d2e26b2 [diff] | |
parent | 098777d73584d75651b97051a440e667cf06266c [diff] |
Merge "Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours am: 43f79eec8b am: cecf30c3a2 am: 5a50d2b12c am: 34df10ec98 am: 0387fd89f2" into nyc-mr2-dev-plus-aosp