diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-07-28 14:59:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-28 14:59:57 +0000 |
| commit | 4f4d4b56fac05c430c5b72ef637d5fe65a2f7c06 (patch) | |
| tree | 1be19375ba7b5c413e57cceef8b9bb2bb32003f4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 14217fe4a97417395565b7db6cb173731eadeb3a (diff) | |
| parent | 53cab1331bd791b6e4151d9d2c3fcdaa283c32c5 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Controls Lockscreen affordance" into sc-dev am: 53cab1331b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15364077
Change-Id: Icdeceeed4bee459121cf814e8d8e1b9225138bf4
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
