OSDN Git Service

am 49782b81: (-s ours) am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth...
authorJames Dong <jdong@google.com>
Wed, 7 Dec 2011 00:04:38 +0000 (16:04 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Dec 2011 00:04:38 +0000 (16:04 -0800)
commit92ce52ab33d2e02cd5544bf0fe52e8673669e9a0
treea4f7155e7d0e10895947a985fd9e447a72f9a5a0
parent5a066fabb7e41cf0245abbae8e9af1dbb0e51f8b
parente3c80aafbfbfa8484d95de523f2d7369b5c85c1a
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