Gil O'Neil 42995cfcce Merge "Make TelephonyManager#{set/get}{Voice/Date}ActivationState SystemApis"

2017-12-21 23:36:20 +00:00

..

android/telephony

Merge "Make TelephonyManager#{set/get}{Voice/Date}ActivationState SystemApis"

2017-12-21 23:36:20 +00:00

com/android

Merge "SMS over IMS APIs revision" am: 2bf7f03e63 am: f9eba1a18f

2017-12-21 20:10:03 +00:00