| commit | ed1d1838f07851484f378a3e2d6df63736aa78be | [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 | 29e879e44814b2afd0ec7f9935239f3154a916de | |
| parent | a0befca9401249332443e2db45dd5226f2ac81d7 [diff] | |
| parent | 49782b8100a752056f044f6f3f1cf16a6a1f03b4 [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