diff options
author | Andreas Huber <andih@google.com> | 2010-08-30 16:16:03 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-30 16:16:03 -0700 |
commit | 03e83d4ad909f5c07fb2011e03348a413453e909 (patch) | |
tree | c660d84030d3ea91fbd6e54a555f2fc49286f694 /graphics/java/android/renderscript/ProgramRaster.java | |
parent | 987556bc9bc1a61415b6e65bd600b8daf5b24d30 (diff) | |
parent | 68ae91cbd20939e48ad15c15405048e7ff9fe2f8 (diff) |
am 68ae91cb: Merge "Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we\'re ignoring timestamps for gtalk videochat but we still have to have a placeholder." into gingerbread
Merge commit '68ae91cbd20939e48ad15c15405048e7ff9fe2f8' into gingerbread-plus-aosp
* commit '68ae91cbd20939e48ad15c15405048e7ff9fe2f8':
Recent changes to the rtsp code require every buffer fed to the packet source to have a timestamp, we're ignoring timestamps for gtalk videochat but we still have to have a placeholder.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramRaster.java')
0 files changed, 0 insertions, 0 deletions