OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a423b46 3eb4987)
am 3eb49879: am 729f4808: Merge "Revert "SurfaceTexture: inherit from ConsumerBase...
authorJamie Gennis <jgennis@google.com>
Mon, 20 Aug 2012 21:37:03 +0000 (14:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Aug 2012 21:37:03 +0000 (14:37 -0700)
* commit '3eb49879918a54f090ec9252d7d3072dd4d31e94':
  Revert "SurfaceTexture: inherit from ConsumerBase"


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