OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 163110b 9e08ee7)
am 9e08ee74: am f7f63450: Merge "Revert "SurfaceTexture: call ConsumerBase::freeBuffe...
authorJamie Gennis <jgennis@google.com>
Mon, 20 Aug 2012 21:37:02 +0000 (14:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 Aug 2012 21:37:02 +0000 (14:37 -0700)
* commit '9e08ee7493133e94ddd6c616e3ae36ec96a5e855':
  Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"


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