diff options
| author | Craig Mautner <cmautner@google.com> | 2014-04-16 20:13:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-16 20:13:09 +0000 |
| commit | 934ef05799532b75d349338c4300671cec1ab162 (patch) | |
| tree | 6422642f31cd4fa03e324b312c0fde24b47e379f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2f894fec5b22948558b22753cc472d4559bea942 (diff) | |
| parent | 4b81e89d9b7a2cf3ed5aacd9c647aed47f4c4675 (diff) | |
am 4b81e89d: am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev
* commit '4b81e89d9b7a2cf3ed5aacd9c647aed47f4c4675':
Fix ActivityContainer callback parcelling.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions