diff options
| author | Christian Wailes <chriswailes@google.com> | 2019-06-10 15:31:55 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-10 15:31:55 -0700 |
| commit | bd79bb3dda64b3a13c12ddec8cd664ab438e3a73 (patch) | |
| tree | c31dfcbf7b88af7ad0010e61d222e3e32b1826a8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | eba647c3ed6f67bf06a2a2480bfcb30d6ebb6cf5 (diff) | |
| parent | 068b51383fa4b3a78eaa26e1e19a618f86a9f7bd (diff) | |
[automerger skipped] Merge "Fixes two data races in USAP pool management." into qt-dev am: 5e468cf4dd -s ours
am: 068b51383f -s ours
am skip reason: change_id Ie01637a10b356b80b5aa62291a97f2c167242827 with SHA1 f68c4e2ffa is in history
Change-Id: I88d1381642439c857867057c76fbe40d4165507b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions