OSDN Git Service

Merge changes from topic "am-f03a20d785824cb5973391e78d6c1eb2"
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Tue, 6 Feb 2018 03:50:18 +0000 (03:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 6 Feb 2018 03:50:18 +0000 (03:50 +0000)
* changes:
  Merge changes from topic "ims_apis" am: de65acb915 am: 77230a0b3f am: 83d77063a8  -s ours
  Make ImsService API @SystemApi am: 0e370b4a02 am: a690700bca am: ade4691364  -s ours
  Integrate new MMTel APIs into the framework am: 5b1883b5f1 am: e904f40820 am: a210f34020  -s ours
  Integrate ImsCallSessionListener API changes am: 6ed4ee6847 am: d627bb5039 am: 2c5dc6b6a0  -s ours


Trivial merge