commit | fa4cdfd351c36cd5f7215e0c1a500dc93640a8e1 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 00:54:28 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 00:54:28 2017 +0000 |
tree | 9b8554401a379ec43a18de16104da8e701126eeb | |
parent | 2bca69272007d83c4d6e6f5cd9fe83be66a036dc [diff] | |
parent | 9c3cc88067636a57d1656a514378d3a0fc178366 [diff] |
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e36 am: 806307106b am: d4eff25f9f am: 9c3cc88067 -s ours Change-Id: Idbd485ae40ffb78dea134903fbcbb52bcca89b52