tree 879dea3cd362af9b91a0c0a7e7215ccb80a9e9ec
parent 2005cc7070e24958df2e0b0ad8aecfc94ddb927f
parent 4eaa691175a9afeadf71fa302c563bb34452e1c1
author android-build-team Robot <android-build-team-robot@google.com> 1525389052 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525389052 +0000

Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9-nyc-dev" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81 am: 9822117184 am: 2b41ff76b0
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81 am: 9822117184
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1
  DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name