am 6b3b5d22: Ignore vi backup files.

Merge commit '6b3b5d22a377413a05ec274accd28ac0998fc420' into gingerbread-plus-aosp

* commit '6b3b5d22a377413a05ec274accd28ac0998fc420':
  Ignore vi backup files.