tree 702b8287bf27119292e637ad20241030a3b6283c
parent 0c1164e1711023a14e777f1cfe296925b2f9781b
parent 9352c100cb7db01f757fa9d3b15fb4fa35f606ab
author Edwin Kempin <ekempin@google.com> 1680087369 +0000
committer Edwin Kempin <ekempin@google.com> 1680087369 +0000

Merge branch 'stable-3.6'

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

Change-Id: I257bfaafc0623f2d0319fbd39d0520aa84a2a0b4