tree 6b5dcd4f1b3de9a2c820078d224462b11e584ffe
parent 5fc195c56ec58a8e2e9b6235d7312980ec9a1e8d
parent 23220f2726de43e69a6922b44581c78eca957936
author Charles Munger <clm@google.com> 1573845118 -0800
committer android-build-merger <android-build-merger@google.com> 1573845118 -0800

Merge "Deprecate AliasActivity" am: 95b815e26e am: 66f56ac1e8
am: 23220f2726

Change-Id: I5f47c62422441997eacc57856ffa1bc43a778660