Merge branch 'eclair' into eclair-release

This commit is contained in:
The Android Automerger
2009-11-11 08:36:27 -08:00

View File

@@ -102,7 +102,7 @@ do
$1 != "Length" ||
$2 != "Method" ||
$3 != "Size" ||
$4 != "Ratio" ||
($4 != "Ratio" && $4 != "Cmpr") ||
$5 != "Date" ||
$6 != "Time" ||
$7 != "CRC-32" ||