tree e42e90a25e81cbe0b1971799a22b82a66bc0f8ad
parent e2d2fd13205658a4e11390a8d2789eb66dd31725
parent 3174ca5fcc04416418ac01d5c0b98d6ad0ce649d
author Wesley.CW Wang <wesleycwwang@google.com> 1541737966 -0800
committer android-build-merger <android-build-merger@google.com> 1541737966 -0800

Merge "Disable EmergencyDialer multi window mode" am: c917adbcab
am: 3174ca5fcc

Change-Id: I125637d6605822c30974ae94b26ab91b9501002b