diff options
| author | Josh Tsuji <tsuji@google.com> | 2020-06-10 13:49:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 13:49:07 +0000 |
| commit | 6618668f5ff1af6e454d4da6da0dff88fc762cf5 (patch) | |
| tree | 758c5a20265bb06a9fe941860646ce13acbf3742 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8956216702bb0c5d9563096caae4501b0895d2a6 (diff) | |
| parent | 56fbd2cb6d8b4c6144a19c746dd3bd831fef6fbd (diff) | |
[automerger skipped] Merge "ActivityView animations!" into rvc-dev am: ab0ffd1d48 am: 56fbd2cb6d -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: If14960b763ca88e6fc5e3c65f7ec33a39b02b576
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions