tree b689355ac28b6185f4203bd64cd762d3829e0ff1
parent 6dfeab4ddf3fcb82483f29d146329aa959fc0c82
parent 9da751147af3222258093d9f41cabf0ea1391c04
author Jean-Baptiste Queru <jbq@google.com> 1330101502 -0800
committer android code review <noreply-gerritcodereview@google.com> 1330101503 -0800

Merge "stagefright aacenc: Fix inline asm"