tree 73f7d146f885420dd521fd641feea5dac2588d35
parent 799baadbafe2e3b8ca5536271092eef9c3825fae
parent d01af7b1b22af68dcfc41ff73b5ca691f266b853
author Rahul Sabnis <rahulsabnis@google.com> 1574052371 -0800
committer android-build-merger <android-build-merger@google.com> 1574052371 -0800

Merge "Re-add getAliasName to fix build breakage" am: e905264d3c am: f6231d08d1
am: d01af7b1b2

Change-Id: Ie577452177e364cde4e894f492b439988a6d214a