diff options
| author | Lucas Lin <lucaslin@google.com> | 2020-04-09 03:47:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-09 03:47:58 +0000 |
| commit | 88bb94aa827fd60961c7ea522cdb253b0a7cd280 (patch) | |
| tree | dfa8310f9cdcf257951f89db0d29e3031bef734d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | af455c667fdbef775e21bc585a1d3e44994c6ab3 (diff) | |
| parent | f6be9e76f7cbbf761fe2239d2eaf25e9984b6cc9 (diff) | |
[automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00bf am: f28b2237e2 -s ours am: 5d1cff7776 -s ours am: 174bab33e4 -s ours am: f6be9e76f7 -s ours
am skip reason: Change-Id Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8 with SHA-1 190ce2106f is in history
Change-Id: I4cf2b91e2df262886984f1ed9f745de340c67e72
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions