OSDN Git Service

am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028
authorConley Owens <cco3@android.com>
Fri, 9 Mar 2012 23:09:58 +0000 (15:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Mar 2012 23:09:58 +0000 (15:09 -0800)
commit66da3fdce4dc61f7d1c125eda9b2e065658cc0e5
treee819af92b584beab393add054326526990c4a103
parentd6f3d00b602c16fe4f67932d8f6b47f42fa9bf73
parent972efafb90b543eea51aa5b23104d469a1bcc1fb
am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028

* commit '972efafb90b543eea51aa5b23104d469a1bcc1fb':
  stagefright aacenc: Avoid overflows when calculating normFactor
  stagefright aacenc: Avoid a division by zero