diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-06-27 14:50:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-27 14:50:11 -0700 |
| commit | f6ec3048546cf8f2821f8a67645df3bab243e591 (patch) | |
| tree | 09f67f9dcee30532041b4ed4f1bc5ca4d94b9532 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 93d46952db60090ae22bc8197659a06ae23cb58b (diff) | |
| parent | e6cb43a1ea50681d2da30ce5e8cb5ac97e80e88a (diff) | |
am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev
* commit 'e6cb43a1ea50681d2da30ce5e8cb5ac97e80e88a':
Rename Google Talk to Hangouts in framework
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions