commit | 4d1c25ec432fe873c33719fd20112459ecf00229 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 00:53:49 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 00:53:49 2017 +0000 |
tree | 368af5b5909ce75a6b2ad43cfbe1b5a2cc2bdaa8 | |
parent | bf16fab4e7e2829f219ed671616f062220531b47 [diff] | |
parent | b4c5c522e3c790a743ba6a8e2056359c08f60026 [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 Change-Id: Iae12207ee70e0212fce0f04a34891b7e20f7aeb0