tree 65188ba09eb27350aeb77d6e7a8b4fd7967fb798
parent 926439764a6af997508c43e0b84d9dd563c36604
parent 878044b88a088ca021fdfa113150e7a2233a8f16
author Andreas Huber <andih@google.com> 1336067765 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336067765 -0700

am 878044b8: am ef7f3794: Merge "Revert our seek behaviour to SEEK_CLOSEST_SYNC instead of SEEK_CLOSEST." into jb-dev

* commit '878044b88a088ca021fdfa113150e7a2233a8f16':
  Revert our seek behaviour to SEEK_CLOSEST_SYNC instead of SEEK_CLOSEST.