diff options
| author | Kevin Ma <kma@google.com> | 2014-09-26 19:43:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 19:43:39 +0000 |
| commit | 938ff081a61d31e5eefca7cee582002aea1c06ff (patch) | |
| tree | 41338254738c0418b246116e1c23bed5749ec412 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f0ebe2fa14e71270e6ea159d3734c1ccc2348030 (diff) | |
| parent | 18037f14e8ee8eea7247c03a9cb27e2a8878fd05 (diff) | |
am 18037f14: Merge "Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""" into klp-modular-dev
* commit '18037f14e8ee8eea7247c03a9cb27e2a8878fd05':
Revert "Revert "DO NOT MERGE Fix race condition between binder deaths""
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions