diff options
| author | Andreas Huber <andih@google.com> | 2010-09-01 13:42:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 13:42:46 -0700 |
| commit | 47f2cf620731226a9311db0f864a4e1404e54b96 (patch) | |
| tree | c8b9712330131db576e412017ec940543e702280 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 021a822e76ab34a6404486e23157db6b6c50ec3e (diff) | |
| parent | 412fc7cdb6a1c4b6afe85b58fcc794fd67271942 (diff) | |
am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
Merge commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942' into gingerbread-plus-aosp
* commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942':
Keep gtalk video chat specific code consistent with rtsp changes.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions