diff options
| author | Mohammad Samiul Islam <samiul@google.com> | 2020-11-05 21:59:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-05 21:59:43 +0000 |
| commit | 06b00738050231c11ccdc23c6ce056a04963eea1 (patch) | |
| tree | 7cf49c6568f8738a0eae2b441bfd6b9c7e652479 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5818a30cb715fa4946419e88b6a998e81564348f (diff) | |
| parent | 528f5e86932a9eeadbc60e5a1f83e0fb3fd35d6c (diff) | |
[automerger skipped] Merge changes I34d7ee3b,I99337ea2,I5c190938,If79073a9,Ie3343681 into qt-qpr1-dev am: 71a7e46d2a -s ours am: f7c3a7b332 -s ours am: 528f5e8693 -s ours
am skip reason: Change-Id I34d7ee3b84bc351d58ebf024a7ed10dd7db1f55b with SHA-1 b793c2174e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12978077
Change-Id: I18d8d6b22a9903ab7cc7ba49014aa92cd793ccf6
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions