diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 05:16:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 05:16:50 +0000 |
| commit | a8e67cb17f42d1db4de3a3f213d1f9dfd5388308 (patch) | |
| tree | 262bfb3b7eeb25a7c1076936e3dcaedc632f046e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 530e7e440cfb548f8c99b00f74e31424c2549e64 (diff) | |
| parent | 67cd7e04f90cb8d1e82bfbfe13561818618e68da (diff) | |
Merge "[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 -s ours am: dabac5eca0 -s ours am: 8d5f6704f2 -s ours" into rvc-qpr-dev-plus-aosp am: 67cd7e04f9 -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: I022f18297d6034e40c3a88649ebb43d87bb6d446
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions