diff options
| author | Evan Laird <evanlaird@google.com> | 2019-09-25 11:36:45 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 11:36:45 -0700 |
| commit | d0d5257baa16a7ef23769066269ac434861c0de6 (patch) | |
| tree | ee4c66596c7198d70ddd716bbb3c5fb0ad7e5e9c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 60679929e21c2a9c6d9e736fe884eadabcd3d0ec (diff) | |
| parent | bf54f5ec8be11cc99ec30c6f68293c50db094ac8 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Allow for HTML styling in mobile data type content descriptions" into qt-qpr1-dev am: 99c07af2bf
am: bf54f5ec8b -s ours
am skip reason: subject contains skip directive
Change-Id: Icc982cf37d14446ad0a988bcf46def7b7387d56b
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions