OSDN Git Service

am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"
authorJean-Baptiste Queru <jbq@google.com>
Tue, 24 Jan 2012 16:43:14 +0000 (08:43 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Jan 2012 16:43:14 +0000 (08:43 -0800)
* commit '2ae5805cf18ad6bdbea5def03a488e14c1a8804c':
  stagefright aacenc: Properly terminate a comment


Trivial merge