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)
commitd9f088521782f071fc615df0ebbc80e53e21b2b1
treeb2a92dd5fb2a92f031ada872312920be724fdf56
parent15dfda272eec983508b89fb8bc9ca6f2bb825496
parent5e37bc8d9ba68d6bc42e70a263f7c2969cc3c787
am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"

* commit '2ae5805cf18ad6bdbea5def03a488e14c1a8804c':
  stagefright aacenc: Properly terminate a comment