tree 9cd606bff1e73ae329cb010b11a4a8df32b3e274
parent 03684b9d88cfa8f9775685d7a4efed2c96a57932
parent 7f305ce77069cf8432374f12392a3ce3a476bdce
author Xavier Ducrohet <xav@android.com> 1257375934 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257375934 -0800

am 7f305ce7: (-s ours) Ignore hidden files and vi swap files during packaging. (do not merge)

Merge commit '7f305ce77069cf8432374f12392a3ce3a476bdce' into eclair

* commit '7f305ce77069cf8432374f12392a3ce3a476bdce':
  Ignore hidden files and vi swap files during packaging. (do not merge)