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