tree 74a119abee767f8c6a18152334390eb56700d079
parent 2d44cf6853a51cdcd33944698b9efd112a2fd784
parent 18459a472c28b7b692cad53b207c6598fc0f2ef4
author Edwin Kempin <ekempin@google.com> 1680074334 +0000
committer Edwin Kempin <ekempin@google.com> 1680074334 +0000

Merge branch 'stable-3.4'

* stable-3.4:
  RenameEmail: Preserve files which are not updated

Change-Id: If375fed498680dde896831fa23a3a7608404dbbe