| commit | f33a114e2241fa954be9fa2e689d7632f239e825 | [log] [tgz] |
|---|---|---|
| author | Ben Komalo <benkomalo@google.com> | Thu Oct 14 15:43:53 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 14 15:43:53 2010 -0700 |
| tree | bec397822f34c8fbf707793be43cb857e985f989 | |
| parent | ddc3e8124a0050d2146aefd0df70c039638f285a [diff] | |
| parent | 9579ecb28ded271ccb9624c66ab288ea9f685350 [diff] |
am 9579ecb2: am 6b3b5d22: Ignore vi backup files. Merge commit '9579ecb28ded271ccb9624c66ab288ea9f685350' * commit '9579ecb28ded271ccb9624c66ab288ea9f685350': Ignore vi backup files.