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