diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-16 05:35:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-16 05:35:12 +0000 |
| commit | e5eddb562f6c24a48374f0949b24da40e3e786dc (patch) | |
| tree | 2522fc9866b3186b0fe5fb39316e1f56f55d0895 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ff2c098a61e5349f9048a34414a9fd254c9c0cdb (diff) | |
| parent | 0e6742bd54b7dc039805d06850f4fdabeadb515d (diff) | |
[automerger skipped] Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - DataAllowed" into rvc-dev am: 365dfedd5a am: 9843a64a52 -s ours am: 0e6742bd54 -s ours
am skip reason: Change-Id I62a0249a1462c9e8d71552e2304642eb6bde3eb5 with SHA-1 7c626cb897 is in history
Change-Id: I6b0e5a996504d9a5a8394f0898fe2a94fd4d8434
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions