OSDN Git Service

am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"
authorJean-Baptiste Queru <jbq@google.com>
Tue, 24 Jan 2012 16:40:50 +0000 (08:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 24 Jan 2012 16:40:50 +0000 (08:40 -0800)
commit2ae5805cf18ad6bdbea5def03a488e14c1a8804c
tree8c07ce07b5ba055dde091d1946bbf09e075ebd07
parentadd87f99d9ece26c776abe40297e9a49e08932d9
parent164a984224f5d430757628028f2522329987350f
am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"

* commit '164a984224f5d430757628028f2522329987350f':
  stagefright aacenc: Properly terminate a comment