commit | 5a50d2b12cf8b41286a873aac6a808d36bbc706c | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Fri Feb 03 01:15:15 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 03 01:15:15 2017 +0000 |
tree | fec2c72a0de19d85271d531b0db5194861c499c1 | |
parent | 47bfa0ab2569eca72b1026cdbea0d221591ed661 [diff] | |
parent | cecf30c3a27fcc30df5c770194a80b2c4ce246ae [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 Change-Id: I3737e39d6433792abcd4f78bbf19dc19596f582e