OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 391f32b 2c7eb92)
am 2c7eb92b: Merge "SurfaceTexture: inherit from ConsumerBase" into jb-mr1-dev
authorJamie Gennis <jgennis@google.com>
Fri, 17 Aug 2012 22:37:56 +0000 (15:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Aug 2012 22:37:56 +0000 (15:37 -0700)
* commit '2c7eb92b6394427bfe81962668d46194959bc722':
  SurfaceTexture: inherit from ConsumerBase


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