diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-09 19:51:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-09 19:51:27 +0000 |
| commit | 648b6b5dd4e0d1d3d722027a764a63b2c8f3e4c3 (patch) | |
| tree | c66290452393b8fd7c3a20ef91d8446d4e268c41 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ac1f0eb45aa88ff975842dabc5c30c3700104823 (diff) | |
| parent | 548ddc79d3d597b03ebc9d653194696af4a7308c (diff) | |
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: 548ddc79d3 -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293
Change-Id: Iaf1a4699a19e745ed1a21d593fc0464b9deee56c
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions