diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 23:33:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 23:33:30 +0000 |
| commit | ba7e4fe49cbdd003e383fcf4b609fb76e4a188ba (patch) | |
| tree | 5a7d6af2c5e4beb1fb327a4aecf88990330bc806 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b0eba784aca153cd25eb88d7f45e79a8793564b5 (diff) | |
| parent | 91f6f26b003e45ce85ea0da7b720a260a910af9f (diff) | |
Merge "[automerger skipped] Merge "More fixes towards the race conditions in AMS" into qt-qpr1-dev am: 480dc8cde6 -s ours am: 86dcec42d1 -s ours am: a4e79c7d16 -s ours" into rvc-d1-dev-plus-aosp am: a7325f9638 -s ours am: 91f6f26b00 -s ours
am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 9450069de9 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11605558
Change-Id: Ib71eccc09e7f7fb6662d76d1c622248a8bd17222
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions