tree aaca7adc70d98512e2bc4e2536b7533efc99bbd7
parent e5b37981cfc642544a7a764e860e8cee3b75ef1e
parent 5e866868e1f6832b0e54c1136908d5d371965e57
author James Dong <jdong@google.com> 1281633768 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281633768 -0700

am f4e26da1: am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread

Merge commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04'

* commit 'f4e26da1af90145564f6065d62cf8efcef0c6f04':
  Fix a crash due to unnecessary check on the codec config data for H263 video track