Brad Ebinger 1077aac2a8 Merge "Support RRO for emergency number conversion map" am: 671680e504 am: 8498a6cffd am: ddd73513e6 ...

am: 8187781e37

Change-Id: I80f11d2c105eeeb08f37f9b6083b9709cae5453f

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

..

android/telephony

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

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

com/android

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

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