diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 14:18:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 14:18:44 +0000 |
| commit | 13fea226355caa1ae5e860a5a3b5147e3623f465 (patch) | |
| tree | d6251d2eb6c86fe0836a2825bc1d1a7921e38f47 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 09b96ede108b2b615097aa888f1ba1bb218fd0de (diff) | |
| parent | 44943c9ec29285ba9dde3a75c65957463be349f4 (diff) | |
[automerger skipped] Merge "Merge "ActivityView animations!" into rvc-dev am: ab0ffd1d48 am: 61d58dcf0a am: bfb7eecd68" into rvc-qpr-dev-plus-aosp am: 44943c9ec2 -s ours
am skip reason: Change-Id I0b01dab4bb0c82873afc55d054bafc672bacc8bf with SHA-1 06785ab656 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11793537
Change-Id: I3ee092d22fb5f2f380bf59d3edeaddce5a437b79
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions