Shuo Qian a43b382766 Merge "Add new error code in SmsManager" into oc-mr1-dev ...

am: 1dafcc89a5

Change-Id: I938ddabfe0d98ee1eee850ba9d6aeb857ebb748f

2017-08-24 21:44:54 +00:00

..

android/telephony

Merge "Add new error code in SmsManager" into oc-mr1-dev

2017-08-24 21:44:54 +00:00

com/android

Merge changes from topic 'call-session-may'

2017-08-11 18:33:44 +00:00