diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-10 07:21:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 07:21:55 +0000 |
| commit | d2ae0e237a023b11b68930554542c82fa40c5654 (patch) | |
| tree | 6dbfbccfcac3690944bc3ea8d96c678d62e14051 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4fcd38caa0c3713cd479757cc20c8e1bccd4d992 (diff) | |
| parent | 2a9b128a591badc309e3febfaf9eb9d926697286 (diff) | |
[automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 am: b4f800051a am: 2a9b128a59 -s ours
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 9689519213 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818540
Change-Id: I6f717fd3493f20c887ccd8c19e3188d329522002
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions