OSDN Git Service

am 490aee0f: Merge "SurfaceTexture: inherit from ConsumerBase (try 2)" into jb-mr1-dev
authorJamie Gennis <jgennis@google.com>
Fri, 24 Aug 2012 18:13:34 +0000 (11:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Aug 2012 18:13:34 +0000 (11:13 -0700)
commit21dbb2cd6fb39ca252db346ce71c1efa6c233ef0
tree97fed915e84c3697091a9897fdb459f814071cfd
parentc17dbaa2c5689ae760da0e681d22a00fcd69fd9e
parent490aee0fc5012acf2bf0b1dfe9c09e6fcca606fc
am 490aee0f: Merge "SurfaceTexture: inherit from ConsumerBase (try 2)" into jb-mr1-dev

* commit '490aee0fc5012acf2bf0b1dfe9c09e6fcca606fc':
  SurfaceTexture: inherit from ConsumerBase (try 2)