diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-26 00:32:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-26 00:32:14 +0000 |
| commit | d7dc6f77f7bfc54d272f012fbe7d31ed181e430e (patch) | |
| tree | dabb20e05b762579517ec29ec8f6a8b4b381fcc7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8a2b46d535e28c102b972407faa866cd15246445 (diff) | |
| parent | 16744ac3f7b030f1192d298132256ac06eaff205 (diff) | |
am 16744ac3: am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev
* commit '16744ac3f7b030f1192d298132256ac06eaff205':
Defer removal of activity until animation complete.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions