tree 12aa5bfa117319436f3b59a59d026268385db414
parent 35717dc4757a5d8398c3d0da4ceb68f260070a1f
parent 71eb527474ae2f5070d7f6f3fca92b0bdb71b483
author Chih-hung Hsieh <chh@google.com> 1589309595 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1589309595 +0000

Merge "Ensure unique name for non-merged modules." am: 489013b6c0 am: 8d973bd2f8 am: 71eb527474

Change-Id: I6c36cc9ebe49ac95ab2d8b42c2813052cc83ae34