OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ff0682 8d102eb)
am 8d102eb6: Merge changes I33f59705,Ia4c8c822,I2fb695ab,I2e587afc
authorJamie Gennis <jgennis@google.com>
Tue, 30 Aug 2011 21:40:24 +0000 (14:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Aug 2011 21:40:24 +0000 (14:40 -0700)
* commit '8d102eb6720deccfb8b5872fde531ef6ca580077':
  MediaDump: use the MediaPlayer#setSurface method
  HTML5VideoView: switch to MediaPlayer#setSurface
  MediaPlayer: unhide the setSurface method
  Surface: unhide the SurfaceTexture ctor

1  2 
api/current.txt patch | diff1 | diff2 | blob | history

diff --cc api/current.txt
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help