| commit | 0be123918ed9711214b0f2e3106fdb7de0bcff13 | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Thu May 26 11:41:30 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 26 11:41:30 2011 -0700 |
| tree | d72768ef4ca082a8056993b82c9312a839fcc09f | |
| parent | 93e179bbe7da2edd8c44078cfb39ad515e23e8e6 [diff] | |
| parent | c004a0c925ea2c9c48bbf9670d2ebf96f432c90a [diff] |
am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2 * commit 'c004a0c925ea2c9c48bbf9670d2ebf96f432c90a': Revert "Use pread() to get the decrypted data for container based DRM file."