| commit | d20b04a41db9a514b3eab8f3654f95707645ffc5 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 00:22:15 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 00:22:15 2017 +0000 |
| tree | 4e8ec4ba6e1fbd6afaf4c23511a0046d7020ddc3 | |
| parent | 61e917964665cf111a7495142b746a689b71de62 [diff] | |
| parent | b058dc139dcea65def3d8c842aa37ea5dc2695a8 [diff] |
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d Change-Id: Idd1aeb4749741aa8bae76cf43ce3f2bdceff077d