tree b594e7e306e0808afbeecf2ca73b7e943a6a5176
parent ab1f705ee2070c53f128a9b84bb6a9135f62a5d4
parent 16c0b916164b913fa3de497b941ecd4a6ddd82bf
author Android (Google) Code Review <android-gerrit@google.com> 1248294005 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1248294005 -0700

am 5f2b05ea: Merge change 8220 into donut

Merge commit '5f2b05ea3dfdaf63088ea3776af43b79c5698f09'

* commit '5f2b05ea3dfdaf63088ea3776af43b79c5698f09':
  Fix issue 1996218: Disable use of shared memory buffer by SoundPool.