| commit | b9cc7009d12e686b1e50c7ab03457a1594747f13 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 01:50:10 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 01:50:10 2017 +0000 |
| tree | 70c36e82763ceed6d3ee0482e40f8c7dfcc47434 | |
| parent | 85b6fafede671184c4393d199ef4ad91205d63dc [diff] | |
| parent | a5aab481fd0372ac77bd11c56117289afba2b690 [diff] |
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: a5aab481fd Change-Id: I9e6b2a1e9a5ba67239360abe3e9ef1378a242aa4