tree 613100314a4ec5c10cd91949e68a9adcfc6d773b
parent 602269d01d22f9decb791b7981fe0cdbf7c4ea6b
parent dbd85bcaff8087034b191464a1e7282d143f8b90
author liuchao <liuchao741@huawei.com> 1492101360 +0000
committer android-build-merger <android-build-merger@google.com> 1492101360 +0000

Merge "Remove useless code in aacenc" am: 6f2e6b2524
am: dbd85bcaff

Change-Id: I29804a614eaad6875d4c53aea12f2c03ccca0130