commit | 3557654c95bae7754dcd1951ec10742b895817e2 | [log] [tgz] |
---|---|---|
author | Conley Owens <cco3@android.com> | Fri Mar 09 15:13:11 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 09 15:13:11 2012 -0800 |
tree | 1cef092893c2a24640a428736d53a5ac5ef2d3d1 | |
parent | 36fde2688bc32ddd5ed5de834a39ce3c7cd2b6cf [diff] | |
parent | 66da3fdce4dc61f7d1c125eda9b2e065658cc0e5 [diff] |
am 66da3fdc: am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028 * commit '66da3fdce4dc61f7d1c125eda9b2e065658cc0e5': stagefright aacenc: Avoid overflows when calculating normFactor stagefright aacenc: Avoid a division by zero