summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-08-30 16:19:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-30 16:19:55 -0700
commit47416bc4f9beb4147b29bb9d93653a4aa356c37d (patch)
treefa3a4b434ab5ed7d63b0c2fab1a5ca4d6a8e7980 /graphics/java/android/renderscript/RenderScript.java
parent69245638682dfb310651e37a340153bf7ad52ac0 (diff)
parent03e83d4ad909f5c07fb2011e03348a413453e909 (diff)
am 03e83d4a: 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 '03e83d4ad909f5c07fb2011e03348a413453e909' * commit '03e83d4ad909f5c07fb2011e03348a413453e909': 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/RenderScript.java')
0 files changed, 0 insertions, 0 deletions