diff options
| author | Shawn Lin <shawnlin@google.com> | 2020-06-16 10:03:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-16 10:03:11 +0000 |
| commit | 6a7cc1e1b8115e5c84fe753fc6229054c78f2dfd (patch) | |
| tree | c323fa6f8d49088becbcb76b5fa31a5d6a694a25 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6dae2090a1f8917758959f5ebc6533f906659209 (diff) | |
| parent | afa2d8c4d1db2a1d32fea33bcb3e359b471890d6 (diff) | |
Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev am: 1c2e8eafff am: 3983dda63e am: a221212709 am: afa2d8c4d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862402
Change-Id: I30ae73cfa7129bb5fd1863c96d4788e349420e09
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions