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
tree: 7e02aa4c94d9e67b89d8c64b924593ab199c74f1
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/