diff options
| author | Chris Tate <ctate@android.com> | 2020-06-03 22:29:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 22:29:35 +0000 |
| commit | 07715f906a6b53162853b8113c220fb94a4b6047 (patch) | |
| tree | 7650592826271413efc39a1c633eeed09fa5d35c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 86dcec42d1673f3a27abeae75fc33eb8b4aeeee1 (diff) | |
| parent | c7f10afcae9ea0992afbdb04e0c4c16b103f012f (diff) | |
[automerger skipped] Merge "More fixes towards the race conditions in AMS" into qt-dev am: 89600e2289 -s ours am: c7f10afcae -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: I08729c29660c607a53571a1ac8d2e75a8213fda4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions