| commit | 8d302f6d27b95317c7508bc19eb7f35aa83cfd5c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon May 21 15:22:12 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 21 15:22:12 2012 -0700 |
| tree | bbc8bba4ff462cbb2c9f65b91dfe18e331a24b5d | |
| parent | a48e7ff33231a354f6da5aff04d4b609a6fabe2b [diff] | |
| parent | ce5b506ef7a9dde769056419e40c67f96cfad6a7 [diff] |
am ce5b506e: (-s ours) am 64f77c5e: Merge "stagefright avcenc: Use intptr_t for casting pointers to integers" * commit 'ce5b506ef7a9dde769056419e40c67f96cfad6a7': stagefright avcenc: Use intptr_t for casting pointers to integers