OSDN Git Service

Merge "Merge "Change IMS callback AIDLs to be oneway" am: a46600e0e7 am: 44da663308...
authorBrad Ebinger <breadley@google.com>
Fri, 11 Aug 2017 03:43:49 +0000 (03:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Aug 2017 03:43:49 +0000 (03:43 +0000)
am: 0778f438a1  -s ours

Change-Id: Id9bdc970a75b158cd1943223ecd88caac4c7b6f0


Trivial merge