| commit | 7c21224b8c78cdf52412fbcb49a79edb20b42c19 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jan 24 08:43:14 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 24 08:43:14 2012 -0800 |
| tree | 62ae95e5606b65456e4877a437dfcb3020b7cee1 | |
| parent | 5f7ea7c272f76a2c35c1cf35a65f45f92315e116 [diff] | |
| parent | c8c4c9b2c817590dce75146428e17778f23c4e29 [diff] |
am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment" * commit '2ae5805cf18ad6bdbea5def03a488e14c1a8804c': stagefright aacenc: Properly terminate a comment