diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-11 11:00:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-11 11:00:22 +0000 |
| commit | 9271a1731c2cd201a046b8390f8d4d89f42afd33 (patch) | |
| tree | 267da8dd861a33bc55353e5d407a40e1b1d05704 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 6d4c20323bd3e4e187538bbdebaf2ee960b2f1d1 (diff) | |
| parent | aff0172222e6958b837744dc76e61df685fd58b2 (diff) | |
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into pi-dev am: f02c375c6f -s ours am: c3d061d3c6 -s ours am: c9c9886577 -s ours am: aff0172222 -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14679690
Change-Id: I50e114eba417ae73e9439f93e31f7a55d79b253f
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions