OSDN Git Service

am 25a86930: am 88876fb4: AudioTrack: fix obtainBuffer timeout calculation
authorEric Laurent <elaurent@google.com>
Wed, 5 Mar 2014 23:51:02 +0000 (23:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 5 Mar 2014 23:51:02 +0000 (23:51 +0000)
* commit '25a86930ac0ccf4750ad2fb0c2f5a4a122d24ecf':
  AudioTrack: fix obtainBuffer timeout calculation


Trivial merge