am ce5b506e: (-s ours) am 64f77c5e: Merge "stagefright avcenc: Use intptr_t...
am ce5b506e: (-s ours) am 64f77c5e: Merge "stagefright avcenc: Use intptr_t for casting pointers to integers"
* commit 'ce5b506e':
stagefright avcenc: Use intptr_t for casting pointers to integers