| commit | c0502b930651092683a5f47c55159b559fae7727 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Feb 27 13:14:45 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 27 13:14:45 2012 -0800 |
| tree | f0ea7935c9b04cdb7c261cbe49910ef0b8031ddb | |
| parent | df712ea86e6350f7005a02ab0e1c60c28a343ed0 [diff] | |
| parent | 7917b452eae7340fcab09b7b406d9d8ca28a4a87 [diff] |
am 5b299d2f: am 18643e70: am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer" * commit '5b299d2f9038452aa09a97d4f2ce57ec20bbc06a': stagefright aacenc: Don't address a Word32 with a Word16 pointer