diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-03 23:10:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-03 23:10:52 +0000 |
| commit | 27dff85e607b0181a14dc8815b01ce66c19eb420 (patch) | |
| tree | faf52f87071b3f764033f33f2099b75685fa325f /framework/java/android/bluetooth/BluetoothManager.java | |
| parent | a43237d5f0a72601dcfcdcb44840a3b898a01dfe (diff) | |
| parent | 996eff5f1bcb4728497af3de590a26ad9597d96d (diff) | |
Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 32aa64764c am: a8ea95fd64 am: 4a7c9cc948 am: 3dd00e5684 skipped: 199d4efcc7
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 32aa64764c am: a8ea95fd64 am: 4a7c9cc948 am: 3dd00e5684
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 32aa64764c am: a8ea95fd64 am: 4a7c9cc948
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 32aa64764c am: a8ea95fd64
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 32aa64764c
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothManager.java')
0 files changed, 0 insertions, 0 deletions