diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 21:16:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 21:16:36 +0000 |
| commit | d428fa4b1a848136ad098db487ff4fbc18ab7297 (patch) | |
| tree | 54ff1acd72085ee8dcdee67c59c00767c9624968 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | fb6f340ebb5264446c81dc784d2362e514a62b25 (diff) | |
| parent | 95a0d167c22878f8ec73e086b82f85991e9f8e8f (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 14d8e24fef -s ours am: b8a30b14dc -s ours" into rvc-d1-dev-plus-aosp am: 6875f4e553 -s ours am: 95a0d167c2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818445
Change-Id: I3f5071f9cb2fb27935efe551cf15e3b239ac7eef
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions