Brad Ebinger 8187781e37 Merge "Support RRO for emergency number conversion map" am: 671680e504 am: 8498a6cffd ...

am: ddd73513e6

Change-Id: Id41d327b54fdf95c86a4f6e8d3727b79b98a2d5b

2017-05-24 20:39:46 +00:00

..

android/telephony

Merge "Support RRO for emergency number conversion map" am: 671680e504 am: 8498a6cffd

2017-05-24 20:39:46 +00:00

com/android

resolve merge conflicts of 2ce1b38e85 to oc-dev-plus-aosp

2017-05-18 10:57:09 +01:00