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