tree db20571736f5a0a61ce49df5319bd272078e4e27
parent 76ddc871edb322842433e7b5d6f12e5c1b77de22
parent 0968c5ca2c31f342e990ecbbbf35f1c999eccf60
author Shuo Qian <shuoq@google.com> 1546023174 -0800
committer android-build-merger <android-build-merger@google.com> 1546023174 -0800

[automerger skipped] Merge "Integrate Emergency functions in Telephony" am: 7160f54c69 am: 1e1e8ac994
am: 0968c5ca2c  -s ours

Change-Id: Ib4ba14d7ada47afad7184bbcf1733ea433519c84