summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothHeadsetClient.java
diff options
context:
space:
mode:
authorAndre Eisenbach <eisenbach@google.com>2016-06-28 00:11:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-28 00:11:57 +0000
commit557f349f4b1b81888f644e58c4fb1ddec8b1650d (patch)
tree4123af6f352d420e58d797e6e564164610c59cf0 /framework/java/android/bluetooth/BluetoothHeadsetClient.java
parentc8a4c8cdbecffe21a7d977b3d552b02cfc08d9fc (diff)
parent837aac6c4e1236dd346305a5efa708ff3d00b4e6 (diff)
Merge \"Merge \\\"Add extra waiting when switching users\\\" into nyc-dev am: 4d6be6b308 am: 3f8ae5a204\" into nyc-mr1-dev-plus-aosp
am: 837aac6c4e Change-Id: I4ba520c3fc42c6ab633b2f6b6a8f3dd89b520453
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothHeadsetClient.java')
0 files changed, 0 insertions, 0 deletions