tree cf9897edde49cd54cfae3ee713b9b260a432dd58
parent a93ff88e7556c4d573364a2e31b84b5de04ee5c7
parent b74f413e1acdd2eb7d9c458a063c1c0c0347899b
author Andreas Huber <andih@google.com> 1282408914 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282408914 -0700

am b29ebd39: am f0ad5484: Merge "In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data." into gingerbread

Merge commit 'b29ebd397e25a7176bcc1c81980f17b0190ebe7f'

* commit 'b29ebd397e25a7176bcc1c81980f17b0190ebe7f':
  In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.