tree 62ae95e5606b65456e4877a437dfcb3020b7cee1
parent 3f92dbe932d2a4e601fe1c238e87d33a81dc7a85
parent e5fb848d1f8dc6a4f0d31f71e3864557b962bd3d
author Jean-Baptiste Queru <jbq@google.com> 1327423250 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327423250 -0800

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

* commit '164a984224f5d430757628028f2522329987350f':
  stagefright aacenc: Properly terminate a comment