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 | 7557d71fb2efabb0d3038a37190a509631175d53 (patch) | |
| tree | bb4e7d94212535a91bd082deb07ae3d633fc130c /framework/java/android/bluetooth/BluetoothServerSocket.java | |
| parent | 67e776a9c0bac7fde8d432a9a369b91492976525 (diff) | |
| parent | 4a7c9cc94803dce8679387cfa73d16cf542841ea (diff) | |
Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9-nyc-dev" into nyc-mr1-dev
* changes:
[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/BluetoothServerSocket.java')
0 files changed, 0 insertions, 0 deletions