diff options
| author | Chris Tate <ctate@android.com> | 2020-06-03 22:57:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 22:57:45 +0000 |
| commit | 45a3abb8d4be3ce31aa24aa79e2fbf4c687976c2 (patch) | |
| tree | 5f756d574b463c36bf093894138de09b5c34d23f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1b5da48f18923d060b3e9ea2a605107146c86a5f (diff) | |
| parent | a4e79c7d165c25188d89f316d44ec72e3338401e (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: a4e79c7d16 -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/+/11605558
Change-Id: Ic067f031445a44c4b7f337ff545e11f2e2d82521
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions