OSDN Git Service

resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp
authorBrad Ebinger <breadley@google.com>
Wed, 2 Nov 2016 17:28:54 +0000 (10:28 -0700)
committerBrad Ebinger <breadley@google.com>
Wed, 2 Nov 2016 17:33:27 +0000 (10:33 -0700)
commitc5eacceb3f628561b0bad9a101c577fc1832b707
tree0e981255cbb2b083b6d855c6ba45d9818b720897
parent5e8b2e411064978b84fba2e0e354ae45e7dd6494
parent4d75bee99b259503d376a7c1604f426001bba75c
resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp

Change-Id: Ib11bb52c9d3826e02089485af93856ba891ad034
telecomm/java/android/telecom/RemoteConnectionService.java