OSDN Git Service

resolve merge conflicts of 39957c0 to nyc-dev-plus-aosp am: 4a7ba7568d
authorMarie Janssen <jamuraa@google.com>
Wed, 8 Jun 2016 16:22:13 +0000 (16:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 16:22:13 +0000 (16:22 +0000)
commitd8c5314d44eaabced47d7ed58c40a7d9313be7b8
tree72432a0e6b7910149a2ff48338a5927a74cc4d05
parent8090ee52ed5d799b4484d7612da747c492d250f7
parentec83a6ce89ed195285292b4a37d2b18022df0f13
resolve merge conflicts of 39957c0 to nyc-dev-plus-aosp am: 4a7ba7568d
am: ec83a6ce89

Change-Id: If5f58c53069532893c0b68965c484fa83e2a103b
src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java
src/com/android/bluetooth/avrcp/AvrcpControllerClasses.java
src/com/android/bluetooth/avrcp/AvrcpControllerConstants.java