summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2020-06-24 05:16:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-24 05:16:03 +0000
commit3cd1830fe80e2b68cff7fa5097dc50ac5c60691f (patch)
tree262bfb3b7eeb25a7c1076936e3dcaedc632f046e /opengl/tests/gl_basic/gl_basic.cpp
parent2ecb0000a4e98ec1021243e2f85561cbb7c58f9b (diff)
parent31975033d18ae74002bee2270178cc6ca630211a (diff)
[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 am: 67d68b3245 -s ours am: 17ab150ee0 -s ours am: 31975033d1 -s ours
am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 6b4ea1d89b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638 Change-Id: I1f2aeee2fa48978901396c10e2da2f354b354521
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions