diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-20 00:24:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-20 00:24:53 +0000 |
| commit | 868947f06d2c051278d0b01de47469b5eea38315 (patch) | |
| tree | bc9d2250ba3ac2656d5ba2d42d557375fc70ebe8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c244b3d37a164512aeac5be4236b89c041e9dd67 (diff) | |
| parent | add578344eca17216e0cfad04ff1159abc21a96f (diff) | |
Merge "[automerger skipped] Merge "Update preloaded-classes-blacklist" into rvc-dev am: fe913ac721 am: 922647476a am: edf84ed00c -s ours" into rvc-qpr-dev-plus-aosp am: add578344e -s ours
am skip reason: Change-Id I5be50e9ec2a43d82dd5225b2f685897afa40d818 with SHA-1 f44c588c45 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11903787
Change-Id: Iff6fa48ed8e7cd613204278403ee719934119862
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions