OSDN Git Service

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


Trivial merge