tree 102d9021720f565a1384d008c4dee35eaf53c3ef
parent e561cf83bb0ee8e67602e9e1bde2081ff01fa1be
parent 5964d5a460ed2da0c82265405bb314a0f24ecb9e
author Nandana Dutt <nandana@google.com> 1542896498 -0800
committer android-build-merger <android-build-merger@google.com> 1542896498 -0800

Merge "Remove unused rename code" am: ebad925405
am: 5964d5a460

Change-Id: I078e4ede7f1abc45a95f1d5b8baa61926c235b5a