commit | b4c5c522e3c790a743ba6a8e2056359c08f60026 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 00:43:16 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 00:43:16 2017 +0000 |
tree | f11e52af9e99a105f7cbc99d8b605dce13638578 | |
parent | f51e8e86421fddb20aa71db6918575a7d38405fe [diff] | |
parent | 00af0a6d2c513a6676e97628fd40c83156f68066 [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 Change-Id: I367da25f89c5c982f6eacaa1929dbbcbf15801f0