OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d4bf6e a9798d3)
am 57ea96a4: Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Dec 2011 16:09:57 +0000 (08:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Dec 2011 16:09:57 +0000 (08:09 -0800)
* commit '57ea96a4b3273aa8592873355a2f79c74b1abec1':
  SurfaceMediaSource: use the HW_TEXTURE usage bit
  SurfaceMediaSource: use the HW_TEXTURE usage bit


Trivial merge
frameworks/av
About OSDN
Find Software
Develop Software
Help