diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2017-02-03 01:24:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 01:24:20 +0000 |
| commit | 34df10ec985354ea70059c7f4ea5c1744da3b8e6 (patch) | |
| tree | a0cbbd8572e2db353cd29f719ea826a43b8ec9e3 /opengl/java | |
| parent | 6cfa84791d004849f4f5deac96a9624276109138 (diff) | |
| parent | 5a50d2b12cf8b41286a873aac6a808d36bbc706c (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
Change-Id: I32bf2850fe25f5e0ec9df96042da467a21d90990
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions