tree ed6c3e4cdfe3e413149f62962150069e4701a396
parent f644eaaaa69c4e9dd5e2db70569100ee765fd8a1
parent 79c683e65909466843282ab07a3ce9e4532f69dd
author Chuck Liao <chuckliao@google.com> 1541032091 -0700
committer android-build-merger <android-build-merger@google.com> 1541032091 -0700

Merge "Add a new carrier config to support emergency dialer shortcut feature." am: c85fa5471d
am: 79c683e659

Change-Id: I05e0367341221111c22fb583625412f1bffeb9aa