diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-06-27 21:46:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-27 21:46:19 +0000 |
| commit | e6cb43a1ea50681d2da30ce5e8cb5ac97e80e88a (patch) | |
| tree | 09f67f9dcee30532041b4ed4f1bc5ca4d94b9532 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 67603c6e1b88fa20db58f69354e3925ffba037d1 (diff) | |
| parent | cad220a4523dc9366957faf920e33f11f887b7dd (diff) | |
Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions