tree ec5bbc580685f911590804b2bab3cee958848e9c
parent 9e9bcb2c0c8e28291775138344cc687b3e6e92ef
parent 70361bfe567cc86343126a7ca2f92cb109711aa0
author Andreas Huber <andih@google.com> 1305653518 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305653518 -0700

am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2

* commit 'c56e81c88706d79ce51a314b5bfd3e247ca6f86c':
  DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2