| commit | 05e13b9edd3ef6edb286ddc2d92bebecf6666bf8 | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Wed May 25 14:54:19 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 25 14:54:19 2011 -0700 |
| tree | a5065d08a11dfa74c304fb5121f17babfd382f4c | |
| parent | 6ef142a05081333f104abde225af9eccd1b92d6c [diff] | |
| parent | c1ded373951f8bd489401e93f2dd512ff9705a49 [diff] |
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."