| commit | f06a99bbc159a691ad618865c4faecbf185371cd | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jan 24 08:46:26 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 24 08:46:26 2012 -0800 |
| tree | a4dec391951c077b0c84b2b6d03557af49046e3b | |
| parent | bd1b8756295539dd329b9eb41a9e5d2bbb805108 [diff] | |
| parent | d9f088521782f071fc615df0ebbc80e53e21b2b1 [diff] |
am 10c4641c: am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment" * commit '10c4641c2e2f747f8fef7d217d550b7f9a6de588': stagefright aacenc: Properly terminate a comment