tree de90b46797447d4ac57ff2e4c58258275b8f302d
parent d438bf9adfa03c179dcae679323f34d2f1269ea8
parent 8e186abd9c35c5fa387c32b5214abd3805e29f96
author Chuck Liao <chuckliao@google.com> 1542163550 -0800
committer android-build-merger <android-build-merger@google.com> 1542163550 -0800

[automerger skipped] Merge "Disable emergency dialer shortcuts feature" into pi-dev am: e21b357889  -s ours
am: 8e186abd9c  -s ours

Change-Id: I50008fd00da154ab03ec96570ea521f3340e9c59