tree e7e0c6f9f6f4b61cdc99c986185943b5646ffe5c
parent 95b6e531a68561e3381645c0998aa799ae70018e
parent e9234f17dfbb192c96b122b9e0ce8cd9015d1589
author Andy Hung <hunga@google.com> 1413578551 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413578551 +0000

am e9234f17: Merge "Fix AudioTrack retrograde getPosition when restoring tracks" into lmp-dev

* commit 'e9234f17dfbb192c96b122b9e0ce8cd9015d1589':
  Fix AudioTrack retrograde getPosition when restoring tracks