| commit | 53bebaf2495b2034b5b5900cb39485b00bdac15b | [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 | 01e4b6880775ebe3ea951c108040442dc0e9d23d | |
| parent | 62bcf26ee0ac7e7460a35800520de363c898ec33 [diff] | |
| parent | a2b2c9f9661a54e431430b029ce76332c6914f0b [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."