OSDN Git Service

Merge "Bug 4571308 Provide correct video frame timestamps"
authorGlenn Kasten <gkasten@google.com>
Fri, 1 Jul 2011 22:02:33 +0000 (15:02 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 1 Jul 2011 22:02:33 +0000 (15:02 -0700)
commit03f9435273df3c8d6f342adfc391844a18535adf
tree31d7f43b759f6e80e99f306153f08189b99f483d
parent02cc72c10072970bfa0735759b2c043626f319db
parent5c2faf3dc310b100707eb9e32e1e5ae8ceffd0c6
Merge "Bug 4571308 Provide correct video frame timestamps"
graphics/java/android/graphics/SurfaceTexture.java
media/java/android/media/MediaPlayer.java
media/libstagefright/AwesomePlayer.cpp