tree 32f83006fd40076bb74d5b5764595127efd7f4f2
parent f8c1f1298ac3ede518c8d29eeb6719746c6afaf0
parent 98c531dca9e52af280ca002658bbe38775b3f6ae
author Jean-Baptiste Queru <jbq@google.com> 1312330745 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312330745 -0700

am 98c531dc: am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"

* commit '98c531dca9e52af280ca002658bbe38775b3f6ae':
  Fix a compiling error when trying to use setBufferCount