| commit | e5a94699e16e0d89708b7800a3a25830103afa0e | [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 | df3a3f4fd0bf0de0417cbdeeaf4efa8a62e9253e | |
| parent | de0fd15bdc82feb5f57d18696f9cdf67d53cc911 [diff] | |
| parent | 7bc0c0a8b7d1e6276bc065d942cdfbd2e1b762a2 [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