tree ef93a0e8b92eacedc381a39ce8d8f0bdeadae704
parent f2e4565c5f216d38bca20fcd3323deda3f6d3ac6
parent bb9a36c24160e131db786d69dc4a794706708209
author Dan Austin <danielaustin@google.com> 1443544743 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443544743 +0000

am bb9a36c2: am 54b3c3c7: am 6c4cf7fb: Merge "Fix benign overflow in AudioTrack"

* commit 'bb9a36c24160e131db786d69dc4a794706708209':
  Fix benign overflow in AudioTrack