tree 932807f7c3d64ad937ece314897cdf5853399af6
parent 3162225d51c62cd6f0e89edc5fe272adbc8ddc39
parent 3557654c95bae7754dcd1951ec10742b895817e2
author Conley Owens <cco3@android.com> 1331334932 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1331334932 -0800

am 3557654c: am 66da3fdc: am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028

* commit '3557654c95bae7754dcd1951ec10742b895817e2':
  stagefright aacenc: Avoid overflows when calculating normFactor
  stagefright aacenc: Avoid a division by zero