Jordan Liu 0ed1bf8e4d Merge "Use SubscriptionId instead of SubId" into oc-dev ...

am: 8079a69eba

Change-Id: I6088d29019aa8dc872a354cbc0b63ddb87c95b00

2017-04-20 17:15:13 +00:00

..

android/telephony

Merge "Use SubscriptionId instead of SubId" into oc-dev

2017-04-20 17:15:13 +00:00

com/android

Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev

2017-04-14 04:11:29 +00:00