tree bae703f38cac061096878253b7f76b83316a4282
parent 716358633672b3bae722cc19f8833eb85927cc36
parent 0f922456b285d232b11c3ed31b49eb5cef7349f8
author Brad Ebinger <breadley@google.com> 1468257425 +0000
committer android-build-merger <android-build-merger@google.com> 1468257425 +0000

Merge \"Remove old reference to SipCallServiceProvider\" into nyc-mr1-dev
am: 0f922456b2

Change-Id: I4941b3d22c5548e3244e33fe1e218bfd24b17848