Brad Ebinger 8498a6cffd Merge "Support RRO for emergency number conversion map" ...

am: 671680e504

Change-Id: I74cc3235e07116f2f1e03f24f5ea51b73a86af82

2017-05-24 20:27:48 +00:00

..

android/telephony

Merge "Support RRO for emergency number conversion map"

2017-05-24 20:27:48 +00:00

com/android

Consolidated all data allow/disallow logic into one method

2017-05-17 21:16:39 -07:00