tree 65188ba09eb27350aeb77d6e7a8b4fd7967fb798
parent e5121e9da8298021cf245ead2145ba5eb3fb6077
parent ef7f379497199148b5694615e75b3fb2bf666a18
author Andreas Huber <andih@google.com> 1336067612 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336067612 -0700

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

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