tree 4c160aeab0c0f33dd51cbc52510ff8e09b3c1405
parent 06e601f91bb83ca423248ac2ebaa83f9748c6a0d
parent 9989f3cfbbfcbde68163b2e01cd67325fe5390b6
author James Dong <jdong@google.com> 1328297399 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1328297399 -0800

Merge "Keep AACEncoder around for a bit longer to have more time fix issues related to video editor engine"