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)
commit75e7c07412f0dc55633dd0b81d4358ebe307eb0f
tree6a3dcfe5e1ffcc3d3f839e19ded8b645f352f51e
parent51a841af801adf360842b1de48f9564af2c1cb25
parent78074d5dc8122d750d97065a6d5ec419e26350d4
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