diff options
| author | Chris Tate <ctate@android.com> | 2020-06-03 22:35:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 22:35:52 +0000 |
| commit | b61995b565ad6c9e0494da34788618078dd50a57 (patch) | |
| tree | 0338f58b70c6940b14a1571da3570c77933ba54c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4d8c0413772e375ea4bb469e3dfe53eb90a306e5 (diff) | |
| parent | 86dcec42d1673f3a27abeae75fc33eb8b4aeeee1 (diff) | |
[automerger skipped] Merge "More fixes towards the race conditions in AMS" into qt-qpr1-dev am: 480dc8cde6 -s ours am: 86dcec42d1 -s ours
am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 b2e84f0406 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11605558
Change-Id: I82e43b6b7a5923c6404f43a20a3c34965fdd70fd
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions