| commit | c004a0c925ea2c9c48bbf9670d2ebf96f432c90a | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Wed May 25 14:57:45 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 25 14:57:45 2011 -0700 |
| tree | 789b3a40ae47c6718a1ac9f572c1240945b30211 | |
| parent | a1a56bd0e3d730edab327495acd5d90b10a6f1e4 [diff] | |
| parent | 05e13b9edd3ef6edb286ddc2d92bebecf6666bf8 [diff] |
am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2 * commit '05e13b9edd3ef6edb286ddc2d92bebecf6666bf8': Revert "Use pread() to get the decrypted data for container based DRM file."