commit f90ee11cff54eacc5361bea0377c0fea9086ed93
author Ihab Awad <ihab@google.com> Wed Nov 12 13:42:52 2014 -0800
committer Divya Sharma <c_shard@codeaurora.org> Tue Mar 10 05:39:20 2015 -0700
tree a423a29112f423167c99d8909f5cd591095739fe
parent c47895aa592dbf15f6f8ab404f7902d30a3f2ed8

Telecom API updates (3/6)

Bug: 18292176

Change-Id: I28e6aa4fec20aadd77f9a861b0bb8e1e9828cffb

Conflicts:
	src/com/android/server/telecom/BluetoothPhoneService.java
	src/com/android/server/telecom/Call.java
	src/com/android/server/telecom/CallAudioManager.java
	src/com/android/server/telecom/CallsManager.java
	src/com/android/server/telecom/InCallController.java
	tests/src/com/android/server/telecom/testapps/TestVideoProvider.java

Conflicts:
	src/com/android/server/telecom/InCallController.java