diff options
| author | Andreas Huber <andih@google.com> | 2011-05-17 10:37:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-17 10:37:25 -0700 |
| commit | dc449831cf73a7f1c0f242d1ba655dbeca01e8f7 (patch) | |
| tree | 780c93d157bffddf214448fd94218e465cc98fa2 /include/media/mediarecorder.h | |
| parent | 58fb39120c633e3b8aa31b8f0a78e8efc193d59d (diff) | |
| parent | 967ad6eb256c525e39d339a24f1bfc970f47470d (diff) | |
| download | frameworks_av-dc449831cf73a7f1c0f242d1ba655dbeca01e8f7.zip frameworks_av-dc449831cf73a7f1c0f242d1ba655dbeca01e8f7.tar.gz frameworks_av-dc449831cf73a7f1c0f242d1ba655dbeca01e8f7.tar.bz2 | |
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
Diffstat (limited to 'include/media/mediarecorder.h')
0 files changed, 0 insertions, 0 deletions