diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-11 10:59:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-11 10:59:52 +0000 |
| commit | 333f5c979bc4f12527b4187c698724a843059168 (patch) | |
| tree | 9c3dadf8bc2a52edb01e6da7f9e7b6e3a2a78306 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 51855b1f12b1d87e7625c40486c798f36e6d6509 (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: Ibb0187f711beb849cf41682cd3bed3ac5050696c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions