diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 16:20:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 16:20:32 +0000 |
| commit | 4c7737132f83fbe5d27fcef77fdd68e391dd6333 (patch) | |
| tree | e9350fdc6d962d5bd0a319b5666f3e116aa6ea5a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 89c2c43c4fbaf2013b25491f3b11dd2a9c89c4ab (diff) | |
| parent | 1c989cfa90c85f233b3b6dad8af15460c6846930 (diff) | |
Merge "[automerger skipped] Merge "Update extra info before registering" into rvc-dev am: 50440f899e am: 0e1b6cb520 -s ours" into rvc-d1-dev-plus-aosp am: 30c6bd29c7 -s ours am: 1c989cfa90 -s ours
am skip reason: Change-Id Ieaad8cbf1a28af3b97c7f98f74358e417fcad661 with SHA-1 be7265d261 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11745979
Change-Id: I594adfeb0faf2e4dbad8d69efe1456db36abdfef
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions