tree 62121cb62ce7ec68b99924fc7b1b29076de06cb2
parent 56af356a420bb6329cf309d7ad972f8441fd911c
parent f31f630320a53e067ead2848d24ff63b0e0ad3b0
author Xavier Ducrohet <xav@android.com> 1257232601 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257232601 -0800

am f31f6303: Merge change If0d0751e into eclair

Merge commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0' into eclair-mr2

* commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0':
  Ignore hidden files and vi swap files during packaging.