tree aa263b6a776a3ab99a5f869a8419cfa2defc079b
parent 459df4ef8368ea84ce7d07981c6867a7b7fef14e
parent 5f83b95705fa84b87b498d67f3b1b8dc34038474
author Jean-Baptiste Queru <jbq@google.com> 1330106271 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330106271 -0800

am 5f83b957: am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"

* commit '5f83b95705fa84b87b498d67f3b1b8dc34038474':
  stagefright aacenc: Zero-initialize a struct