| commit | ce5b506ef7a9dde769056419e40c67f96cfad6a7 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon May 21 14:52:48 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 21 14:52:48 2012 -0700 |
| tree | c8b6793d00907ee245168374fb1f19a21a5caeec | |
| parent | 7bce428ccc41210d9271b32f1ea94af0ef6bff7d [diff] | |
| parent | 64f77c5e312ff0b45a91853f782f112a99df758f [diff] |
am 64f77c5e: Merge "stagefright avcenc: Use intptr_t for casting pointers to integers" * commit '64f77c5e312ff0b45a91853f782f112a99df758f': stagefright avcenc: Use intptr_t for casting pointers to integers