diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-10 07:14:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 07:14:41 +0000 |
| commit | d4c04b8b56e97c7403ceaa565325d53b0c4c533f (patch) | |
| tree | cfd24a00270bc95d88410fdce4bf3e0c2bae3417 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ce2861cab59253a16678d33638a4aaf19e4a687e (diff) | |
| parent | 5b70d20537d838d0f6f87d4dcbc347738ebe40d1 (diff) | |
[automerger skipped] Merge changes from topic "am-be6a9190f28c4c1fa3990ea22425f5b8-rvc-dev" into rvc-dev am: 8ef4c5bac0 -s ours am: 00ef791466 -s ours am: 5b70d20537 -s ours
am skip reason: Change-Id I829d36339973f9473fe6b616c48aa288f18d1c46 with SHA-1 a4c9570222 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818540
Change-Id: Iaf86a3e7e662be202e0ccfa4dfeb6edf9f9ccf5e
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions