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