OSDN Git Service

am 3a5e36f9: (-s ours) am 98c531dc: am 9b0c6bee: Merge "Fix a compiling error when...
authorJean-Baptiste Queru <jbq@google.com>
Wed, 3 Aug 2011 00:22:43 +0000 (17:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Aug 2011 00:22:43 +0000 (17:22 -0700)
commitc23c64c8f08ac267baf9b0da1f0ad630e8d64dd3
tree42326f0f3d84236a13917882c8d0ee48074faa8c
parent4f0dfe9a89d63b5aae95b1e602b54dfad3a0435b
parent6b115451bfe4ec933cb9be96752d0077bb660161
am 3a5e36f9: (-s ours) am 98c531dc: am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"

* commit '3a5e36f96bf61a8fb71c49cf93bd97c5e1d6abb4':
  Fix a compiling error when trying to use setBufferCount