| commit | 53536d771e61937f1b6a4db26700f304a9c05499 | [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 | 2ee963463c3506b8788200904160b078e5e5a51d | |
| parent | 76a5b2ae10d33f2ab1fc80e9c0c40d932a842907 [diff] | |
| parent | 2d93c9cbd25eec9e0cde30799bddee8b6692e364 [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."