tree 16daa3e763e00a2c68ac3cb6e5e6b7f9d026959a
parent 484fc74beb79d0b8d49223cb3fce9e1ccbfd3501
parent 3e61e413435ed745336c44d63fb6ffa6378e393b
author Jean-Baptiste Queru <jbq@google.com> 1330377146 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330377146 -0800

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

* commit '3e61e413435ed745336c44d63fb6ffa6378e393b':
  stagefright aacenc: Remove a stray semicolon