OSDN Git Service

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


Trivial merge