diff options
| author | Patrick Baumann <patb@google.com> | 2019-11-19 19:57:11 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-19 19:57:11 -0800 |
| commit | 43416238689d84c60f97a173be95b84bf8efa947 (patch) | |
| tree | 40ebf4ee3c77766dc4555a1d7daecbc8fe647ab9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1b6300cdf2c9aefa0281b66cf22f371191bf5fa7 (diff) | |
| parent | ff21f7b085ff45d6f316019660c5c99c4caa3937 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Avoids deadlock when applying preferred activities" am: 35dd014a79 am: 92269e5ef8
am: ff21f7b085 -s ours
am skip reason: subject contains skip directive
Change-Id: If0a866b489e00c333da157c4a3d590cbe9fad032
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions