tree 2f8a8daee6d34a430672d3474a2615505d3d4bea
parent 0a7c41615e61a84c694cb11c9d146cb4bbd14ddc
parent 0cf4d7cd0ce42ebc5f2395b0e8bdd34a35c5beda
author android-build-team Robot <android-build-team-robot@google.com> 1525386971 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525386971 +0000

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

* changes:
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f skipped: 365fb1c844 am: 1839e70cda am: cdc99a0e87 am: f145e8172c am: d72de1bde1 skipped: 2005cc7070
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f skipped: 365fb1c844 am: 1839e70cda am: cdc99a0e87 am: f145e8172c am: d72de1bde1
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f skipped: 365fb1c844 am: 1839e70cda am: cdc99a0e87 am: f145e8172c
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f skipped: 365fb1c844 am: 1839e70cda am: cdc99a0e87
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f skipped: 365fb1c844 am: 1839e70cda
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f skipped: 365fb1c844
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c
  DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name