tree 840dd73dd9c9d3e0e5ae74fcbb3005c5bb4a1fc2
parent e6b9fe094ca913afd88c85045633cfcd03fa5012
parent 5b380319f74d379b154c5ee96acf4ae4eba57fe3
author Andy Hung <hunga@google.com> 1442871469 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442871469 +0000

am 5b380319: am f7b647cc: (-s ours) am c755df5b: am 67a9edde: am d5833ca8: am dffe4621: Merge "DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""" into lmp-dev

* commit '5b380319f74d379b154c5ee96acf4ae4eba57fe3':
  DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""