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