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)
commit7c21224b8c78cdf52412fbcb49a79edb20b42c19
tree62ae95e5606b65456e4877a437dfcb3020b7cee1
parent5f7ea7c272f76a2c35c1cf35a65f45f92315e116
parentc8c4c9b2c817590dce75146428e17778f23c4e29
am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"

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