From: James Dong <jdong@google.com>
Date: Wed, 7 Dec 2011 00:04:38 +0000 (-0800)
Subject: am 49782b81: (-s ours) am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth... 
X-Git-Tag: android-x86-4.4-r1~1579^2~388
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=75e7c07412f0dc55633dd0b81d4358ebe307eb0f;p=android-x86%2Fframeworks-av.git

am 49782b81: (-s ours) am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1

* commit '49782b8100a752056f044f6f3f1cf16a6a1f03b4':
  DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
---

75e7c07412f0dc55633dd0b81d4358ebe307eb0f