tree f30e0e6de135ac5de29460b94590c19015211b77
parent d79ef7f8da3f13cdd219901252bfb7cfd62456a5
author Jon Mann <jonmann@google.com> 1485381115 -0800
committer Jon Mann <jonmann@google.com> 1486419840 -0800

Add more descriptive UI for conflicts while renaming.

Test: updated existing rename conflict test and ran all
Bug: 31647077
Change-Id: I013bb9348e4691aea42f41f58af83e18e8ca106d