diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 16:03:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 16:03:24 +0000 |
| commit | 1c989cfa90c85f233b3b6dad8af15460c6846930 (patch) | |
| tree | e29a99a18199250f01b722651765407d2126dc5b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b771fd535b5043541dd92f079f6c5ce9fe5552a5 (diff) | |
| parent | 30c6bd29c703a394d2897b1768c764444e384c12 (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 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: Iac524d19a8a357a3248368a4bfe15ffa668cdb1e
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions