diff options
| author | Anton Hansson <hansson@google.com> | 2020-11-05 20:16:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-05 20:16:11 +0000 |
| commit | 69c054d0d4b90a40f6bddcd6096c59b471dbb80b (patch) | |
| tree | 70fd2af0002880e95c7532e60f50c386b7fe1d79 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9196f0727975fbd63c58ef446fb6d4cb7a8a08f2 (diff) | |
| parent | dc1367d4605213b87c64a70a0b077be5fbe3ae81 (diff) | |
[automerger skipped] resolve merge conflicts of 8e6e52ec8bb3a6ed5d2a4c3485dcac128b82b658 to rvc-qpr-dev-plus-aosp am: dc1367d460 -s ours
am skip reason: Change-Id I2bd1fa5bac6b35096b3059f93d68ef24b7a464e5 with SHA-1 022aac54d2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12996322
Change-Id: I7d96faf8be2892cac8153bec7111df9339153d39
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions