| commit | 3d8b073a40e133b5104acb0567ec8add038ecd36 | [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 | 0ac702bbd1d5d9458c436d61200b77e197604297 | |
| parent | 49858741150cc115cc8815085899cbfdfb12d2f3 [diff] | |
| parent | 27d4ad2a5771ad025fa69f64b093d7429d94bfd3 [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