commit 2cc2743c2fb00c0cd8c5aded5737c8dc8643fffd
author Hall Liu <hallliu@google.com> Mon Oct 31 14:00:16 2016 -0700
committer Hall Liu <hallliu@google.com> Mon Oct 31 14:00:16 2016 -0700
tree b94cf56ad553d2deb11ebb93b6f78e7f6789b0cd
parent c82e30bff12dca4da09be45adf6c21217f389143
parent f4cf7f3d6bc27e576c4e1a008732e92d5552ef9d

resolve merge conflicts of f4cf7f3 to stage-aosp-master

Change-Id: I8a412bc3998512bc9f0db1d148f186311006e3c4

src/com/android/server/telecom/CallAudioModeStateMachine.java

diff --git a/src/com/android/server/telecom/CallAudioModeStateMachine.java b/src/com/android/server/telecom/CallAudioModeStateMachine.java
index 0a222cc..7121a53 100644
--- a/src/com/android/server/telecom/CallAudioModeStateMachine.java
+++ b/src/com/android/server/telecom/CallAudioModeStateMachine.java
@@ -531,4 +531,4 @@
             return mUnfocusedState;
         }
     }
-}
\ No newline at end of file
+}