summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJosh Tsuji <tsuji@google.com>2021-08-09 19:54:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-09 19:54:49 +0000
commitd31f435f794effd51469e97b48367266b95c9d81 (patch)
treee26ed8e535652800b0ad977a3a4bb4a9a35ca1eb /opengl/tests/gl_basic/gl_basic.cpp
parent7f8b374999715608fc0fbb47a4aa8593aebca684 (diff)
parentd52c7e3ec8f8c099b8f8e649bf19fff5b1b0ca96 (diff)
Merge "Don't call updateIsKeyguard from the UnlockedScreenOffAnimationController if we can't control the screen off animation." into sc-dev am: 5f51b92263 am: d52c7e3ec8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15486170 Change-Id: Ie8ad5a10186ff726286de09383f76913a8db579c
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions