tree b2a92dd5fb2a92f031ada872312920be724fdf56
parent 15dfda272eec983508b89fb8bc9ca6f2bb825496
parent 5e37bc8d9ba68d6bc42e70a263f7c2969cc3c787
author Jean-Baptiste Queru <jbq@google.com> 1327423394 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327423394 -0800

am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"

* commit '2ae5805cf18ad6bdbea5def03a488e14c1a8804c':
  stagefright aacenc: Properly terminate a comment