OSDN Git Service
(root)
/
android-x86
/
packages-apps-Bluetooth.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8090ee5
ec83a6c
)
resolve merge conflicts of 39957c0 to nyc-dev-plus-aosp am: 4a7ba7568d
author
Marie Janssen
<jamuraa@google.com>
Wed, 8 Jun 2016 16:22:13 +0000
(16:22 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 8 Jun 2016 16:22:13 +0000
(16:22 +0000)
am:
ec83a6ce89
Change-Id: If5f58c53069532893c0b68965c484fa83e2a103b
1
2
src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/bluetooth/avrcp/AvrcpControllerClasses.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/bluetooth/avrcp/AvrcpControllerConstants.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java
Simple merge
diff --cc
src/com/android/bluetooth/avrcp/AvrcpControllerClasses.java
Simple merge
diff --cc
src/com/android/bluetooth/avrcp/AvrcpControllerConstants.java
Simple merge
OSDN Git Service
