diff options
| author | Josh Tsuji <tsuji@google.com> | 2020-06-10 14:18:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 14:18:22 +0000 |
| commit | 09b96ede108b2b615097aa888f1ba1bb218fd0de (patch) | |
| tree | d6251d2eb6c86fe0836a2825bc1d1a7921e38f47 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e8f61e264b0583d46590c9875a053c4b167c3b51 (diff) | |
| parent | 559149176c7b5932c6198cfe8cc6a4f2f2c5799a (diff) | |
[automerger skipped] Merge "ActivityView animations!" into rvc-dev am: ab0ffd1d48 am: 56fbd2cb6d -s ours am: 6618668f5f -s ours am: 559149176c -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: Iee4078411cdb9b8552e69650c523135cee24cc00
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions