tree b2e51ea79ac3fb83fa91c0e9906817eacbd203cb
parent 7709cf35b7ca72b4c04ba3010387273ed988007d
parent f050cd0782800ef4b326cf1bcf97997cced4b4fa
author James Dong <jdong@google.com> 1306360459 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1306360459 -0700

am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2

* commit 'c1ded373951f8bd489401e93f2dd512ff9705a49':
  Revert "Use pread() to get the decrypted data for container based DRM file."