| commit | 000c40f6cc0bb616c6d07197cefb74c6a9a69b3a | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Wed Dec 22 12:44:22 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 22 12:44:22 2010 -0800 |
| tree | 33b7b6b8c6f59849cade563b8180b690412bd101 | |
| parent | a0d276683f8535182cd0432b95b423a728eaa2d2 [diff] | |
| parent | e5a94699e16e0d89708b7800a3a25830103afa0e [diff] |
am 27d4ad2a: (-s ours) am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread * commit '27d4ad2a5771ad025fa69f64b093d7429d94bfd3': Expose AMRNB/WB and AAC encoder and related file output formats - do not merge