tree be8c3dc3c8d2a781020eba7fb165c440f81ff38c
parent a3db30f7c53936a3acb87d2c44807ee2f0cfa16e
parent 9c7ebfd56cef49f9a26572b44790868689599e34
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