diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 05:16:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 05:16:21 +0000 |
| commit | 530e7e440cfb548f8c99b00f74e31424c2549e64 (patch) | |
| tree | 262bfb3b7eeb25a7c1076936e3dcaedc632f046e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3cd1830fe80e2b68cff7fa5097dc50ac5c60691f (diff) | |
| parent | ad5ea366c2ef19246ede8ae47cda221907894d89 (diff) | |
Merge "[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 am: 67d68b3245 am: aa1630d0b7 -s ours" into rvc-qpr-dev-plus-aosp am: ad5ea366c2 -s ours
am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 04bef3c435 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638
Change-Id: Ib0a2326956c0541fd0f30dd118af19324a86d6be
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions