diff options
| author | Kevin Chyn <kchyn@google.com> | 2020-07-16 19:31:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-16 19:31:57 +0000 |
| commit | 761f643567fe55c93261bb6b02f14d71dab08c35 (patch) | |
| tree | 4bd70016c850695f89b46a742e0c8f115f5a5195 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4784fdeabf735090d7c34ade51a1f7204b7c1255 (diff) | |
| parent | 91d593209e174c78ccbb24a75efbd1db543f9b0d (diff) | |
[automerger skipped] Merge changes I9ded8efd,Ic26e47c1 into rvc-qpr-dev am: 09ba528a9d am: 91d593209e -s ours
am skip reason: Change-Id I6c9717d1f8ed3e844b3d92727396e2ce2e7fd94f with SHA-1 1f9cce1b37 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166802
Change-Id: I5aa18e9dbf035f6ea909367d854c65c37fd7a2b4
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions