OSDN Git Service

Merge \\"Handle Concurrency issues in Connection\\" into nyc-dev am: df41725e53
authorBrad Ebinger <breadley@google.com>
Wed, 15 Jun 2016 22:57:14 +0000 (22:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Jun 2016 22:57:14 +0000 (22:57 +0000)
commit9d2da303e092659a6881b69b7f21c5e288507503
treed7e52dd140850e9b0f3eae745858ebf7aa15a00e
parentf4152a9c7ecdf9ef392df5b96d35fc928d6a3090
parent53a8774be15b57e9d9ddb2331c8d66df5d218978
Merge \\"Handle Concurrency issues in Connection\\" into nyc-dev am: df41725e53
am: 53a8774be1

Change-Id: Ie9303bed357327079711ba8809fb05c15b9ec7a6
telecomm/java/android/telecom/Conference.java
telecomm/java/android/telecom/Connection.java