diff options
| author | Chris Tate <ctate@android.com> | 2020-06-03 23:32:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 23:32:45 +0000 |
| commit | b0eba784aca153cd25eb88d7f45e79a8793564b5 (patch) | |
| tree | 5a7d6af2c5e4beb1fb327a4aecf88990330bc806 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e821d3b271deb7bcdd3dd7068006b4e610445792 (diff) | |
| parent | 70baabe36317800473e981ac9300d67a1dd4c822 (diff) | |
[automerger skipped] Merge "More fixes towards the race conditions in AMS" into qt-dev am: 89600e2289 -s ours am: c7f10afcae -s ours am: 07715f906a -s ours am: 3cf16a7fe9 -s ours am: 69ff5b56b2 -s ours am: 70baabe363 -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/+/11604125
Change-Id: Id2d9c880c49c603eda5fa6674d5c48160130d186
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions