tree 9be457453b14cd5f708a4327564b0966810fc4f2
parent 6fb01a8a566b3e4bfb71f3030e2c4ebdabad18a0
parent d0e8f1f1551770461274595dc8c882f772a1ce9b
author android-build-team Robot <android-build-team-robot@google.com> 1525394156 -0700
committer android-build-merger <android-build-merger@google.com> 1525394156 -0700

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

Change-Id: Id2d529132100406ca0cefd262d738f498439a8b1