Jack Yu f7149eb698 resolve merge conflicts of d5cb58c693de to stage-aosp-master ...

Test: I solemnly swear I did not test this conflict resolution.

Merged-In: Ifc35306711dde39eb521dc015da931f4d5f2bf06
Change-Id: I9494087c5a90bccc4326c173bf6395996da357af

2017-08-17 23:20:59 -07:00

..

android/telephony

resolve merge conflicts of d5cb58c693de to stage-aosp-master

2017-08-17 23:20:59 -07:00

com/android

Merge changes from topic 'call-session-may'

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