diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 01:15:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 01:15:44 +0000 |
| commit | 170c8666872cdc829c43a29887fb304b6166437d (patch) | |
| tree | 4cec704ffcf62f8d9f8411d53579bb47ceb18c83 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3312e2ccbb87031e071c986e1fc3b088fe0dce88 (diff) | |
| parent | a35533061e60c3040b2687e3c21b88ad5ce9823f (diff) | |
[automerger skipped] Merge "Merge "Suez: change display wake reason to push atom" into rvc-dev am: 5692bbb67e am: a7c4f5d7c2" into rvc-d1-dev-plus-aosp am: a35533061e -s ours
am skip reason: Change-Id I93cb9d5d835f139f327f27340d76c78d20e4bceb with SHA-1 ca62fc4162 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11763893
Change-Id: I5c80538534e9aca2067480389f67b8a0db0cae4d
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions