am 4e97e5da: am 421e8d33: (-s ours) am 7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)
Merge commit '4e97e5da372f1be39e9eeccc9cad7a551c164828' into eclair-mr2-plus-aosp * commit '4e97e5da372f1be39e9eeccc9cad7a551c164828': Ignore hidden files and vi swap files during packaging. (do not merge)
This commit is contained in: