summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-10 15:46:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-10 15:46:31 +0000
commit8ee94151a2d96b6f51ce75c06c662020e177d725 (patch)
treee9350fdc6d962d5bd0a319b5666f3e116aa6ea5a /opengl/tests/gl_basic/gl_basic.cpp
parent9a4d4ff58970875038c65b105e54dc4ad28c6e41 (diff)
parentd31c60aace84b4e5e6a19eaa3839cc9cbba90283 (diff)
Merge "Merge "Prevent NPE while finishing activity" into rvc-dev am: 1dbee3e34b am: b9bd2da6f2 am: 0a55b64371" into rvc-qpr-dev-plus-aosp am: d31c60aace
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788494 Change-Id: Iff4fc5c64b7359277d1513b571afeb2de0e18840
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions