diff options
| author | James Dong <jdong@google.com> | 2011-12-06 16:04:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-06 16:04:38 -0800 |
| commit | ed1d1838f07851484f378a3e2d6df63736aa78be (patch) | |
| tree | 29e879e44814b2afd0ec7f9935239f3154a916de /tools/aidl/generate_java.cpp | |
| 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
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions