diff options
| author | Jason Sams <jsams@google.com> | 2014-03-13 10:50:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 10:50:15 +0000 |
| commit | 534606b44a865874b00fba24517a8e218ec56075 (patch) | |
| tree | d5046b0b305b80c112706fc3af488f0090637bc7 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 2ffcffd046e321b871a04480552cef6ee4735e62 (diff) | |
| parent | 632c915ce8675033bbb7d356239d16594b26dffb (diff) | |
am 632c915c: resolved conflicts for merge of 780d57b8 to klp-modular-dev
* commit '632c915ce8675033bbb7d356239d16594b26dffb':
Fix destruction issues relating to AllocationAdapter.
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions