diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-10 07:16:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 07:16:51 +0000 |
| commit | 3c98eb5b13bab770333cda0b3f2ee8d550a8c379 (patch) | |
| tree | 6dbfbccfcac3690944bc3ea8d96c678d62e14051 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e22c25c5a8b367569fb6275017e8e4c312d7971d (diff) | |
| parent | 161945877efad2c228b75872c9e98d6900a7ab93 (diff) | |
[automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 am: b4f800051a -s ours am: 161945877e -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: I55397954c2c6ce08a9e12fb97191a52d70dde662
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions