| commit | a2b2c9f9661a54e431430b029ce76332c6914f0b | [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 | 03316709fbe93720a1c21c298ecaa5d2a81bc2d9 | |
| parent | b1d713703b00dc972ceb2a655d5bac72381f303d [diff] | |
| parent | f29f13077582425c242a36565bd71130fedf3cd0 [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."