| commit | 013c9c324e281857ca584b7d092026b3062aedca | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 08 13:13:26 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 08 13:13:26 2012 -0700 |
| tree | 6720852bc5377b410f2f279f5462fbd20cc7a9ad | |
| parent | a018268b84bcf72d346f466c401f9fda6ce506bb [diff] | |
| parent | 3269b5314f02eb3724be8d45880f15762fac09c0 [diff] |
am 3269b531: am 80c46255: am 874a074a: Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints" * commit '3269b5314f02eb3724be8d45880f15762fac09c0': avcenc: Switch malloc/free callbacks to use pointers instead of ints