tree 0ecbd0769f339854cca023a8cf56e75f0ba5aa63
parent 8cf0614965de76a28a7aac951a2d3abd2130bba5
parent 313019d1ad575085cf9fa035d14d3bab703707cf
author Jean-Baptiste Queru <jbq@google.com> 1330376990 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330376990 -0800

am 32901b39: am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"

* commit '32901b397b590cc9133d21caab20b5ef01f0dd04':
  stagefright aacenc: Remove a stray semicolon