commit | 27d4ad2a5771ad025fa69f64b093d7429d94bfd3 | [log] [tgz] |
---|---|---|
author | James Dong <jdong@google.com> | Wed Dec 22 12:40:57 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 22 12:40:57 2010 -0800 |
tree | ebdfd8fe462e86500a411536971a251d6faacf00 | |
parent | 2f209e885a86b8396fe1344043cf9858751fcb64 [diff] | |
parent | 2bf89b2197674ccc414ea60a61199562df9dc52b [diff] |
am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread * commit '2bf89b2197674ccc414ea60a61199562df9dc52b': Expose AMRNB/WB and AAC encoder and related file output formats - do not merge