| commit | 92ce52ab33d2e02cd5544bf0fe52e8673669e9a0 | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Tue Dec 06 16:04:38 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 06 16:04:38 2011 -0800 |
| tree | a4f7155e7d0e10895947a985fd9e447a72f9a5a0 | |
| parent | 5a066fabb7e41cf0245abbae8e9af1dbb0e51f8b [diff] | |
| parent | e3c80aafbfbfa8484d95de523f2d7369b5c85c1a [diff] |
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