| commit | 2de4113c10975648ad9d1cffa45847870a0d01b3 | [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 | 6440533289eaa5251f3bd54d0c7e3ca308d4f292 | |
| parent | 8d91237333c60c4a6839358109265e8847df23f3 [diff] | |
| parent | 53bebaf2495b2034b5b5900cb39485b00bdac15b [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."