commit 1d77ec91eed8e05af563b65a2f5e8ddfc5b24237
author Lalit Kansara <lkansara@codeaurora.org> Wed Dec 07 01:42:37 2016 +0530
committer Lalit Kansara <lkansara@codeaurora.org> Wed Dec 07 01:42:37 2016 +0530
tree de3f5ca174227a4a10ff69d9ead864a7afc048c6
parent 4463e1b5bd857930d487064b07cb9b663a6a3a25
parent a66a6cb102a3de96a9a19a032d820e168b4b8cf4

Merge commit 'a66a6cb102a3de96a9a19a032d820e168b4b8cf4' into remote

Conflicts:
	Android.mk
	src/com/android/server/telecom/BluetoothPhoneServiceImpl.java
	src/com/android/server/telecom/Call.java
	src/com/android/server/telecom/CallsManager.java
	src/com/android/server/telecom/ConnectionServiceWrapper.java
	src/com/android/server/telecom/NewOutgoingCallIntentBroadcaster.java
	src/com/android/server/telecom/ParcelableCallUtils.java
	src/com/android/server/telecom/TelecomSystem.java
	src/com/android/server/telecom/callfiltering/DirectToVoicemailCallFilter.java
	src/com/android/server/telecom/components/TelecomService.java
	tests/Android.mk
	tests/src/com/android/server/telecom/tests/TelecomSystemTest.java

Change-Id: Ia19fc06f6fbbb91e79edfa87b2d774f076eeab71