tree 1585b12ba06567efb93e2c9f9408a7e4a79ce661
parent d0e8f1f1551770461274595dc8c882f772a1ce9b
parent eaa6d200b33aa356fcd5194576493153c20a3e45
author android-build-team Robot <android-build-team-robot@google.com> 1525396000 -0700
committer android-build-merger <android-build-merger@google.com> 1525396000 -0700

[automerger skipped] Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into oc-dev am: 8d16d7915d
am: eaa6d200b3  -s ours

Change-Id: Icb1b568faee09aa2113c1d832974f37d21ee96b0