16b696af61
Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-plus-aosp * commit '617262d8f57362536ddc00a070c1c0994741de44': add "junk path" -k option to aapt (DO NOT MERGE)