tree b7888a72e652342afee90836c41058433d726d92
parent 8825b9c99a3b565c8e5cbab3f890060c46e876b6
parent 38aaf2e16d56a65b1f9b14a3fdafbb092e82bdcb
author Leo Hsu <leohsu@google.com> 1548803878 -0800
committer android-build-merger <android-build-merger@google.com> 1548803878 -0800

Merge changes from topic "apply_promoted_emergency_numbers"
am: 38aaf2e16d

Change-Id: I5f35cd39ef8d0e66b060ebe7dd32607720dccc20