diff options
| author | Chris Tate <ctate@android.com> | 2020-06-03 23:15:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 23:15:25 +0000 |
| commit | 55ed0b02960d296b39c8c817abb337b997738263 (patch) | |
| tree | 5f756d574b463c36bf093894138de09b5c34d23f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d6bd49d9c628e1cb5d4d0d749a0f6aca7f88edb1 (diff) | |
| parent | 127f7f146deb5eca126fe8e6056920db803986ff (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: 127f7f146d -s ours
am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 b581128020 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11604125
Change-Id: Ied7dc8327a5e8093802870b73787a3562b0862a6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions