| commit | 6b75e412b32ed3efc11e38a1ea790f8683b6af34 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Tue May 17 10:37:25 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 17 10:37:25 2011 -0700 |
| tree | 49b86ac47ed5fce83725362d37d900bfaf09cf4b | |
| parent | 021253406c63001b0b007dba20b22ad117c47045 [diff] | |
| parent | c9eb18bb72d594bdbd1593a8dc6a9b10fa44ec42 [diff] |
am c9eb18bb: (-s ours) am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2 * commit 'c9eb18bb72d594bdbd1593a8dc6a9b10fa44ec42': DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2