tree 3ad44846c2ba502ceaf6ee0262e853ab71aedc7a
parent 23315af052cbef1fe427490eea7979908dccf032
parent 5c9fb641d93fa6758978adfb02cc0f2a51d02bdc
author The Android Open Source Project <initial-contribution@android.com> 1376510570 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376510570 -0700

am 5c9fb641: (-s ours) Reconcile with klp-release - do not merge

* commit '5c9fb641d93fa6758978adfb02cc0f2a51d02bdc':
  Fix regression for AudioRecord streaming callback mode