tree 1b2b4b9c3b1061009d5f57dfaaa62f444f65fcb8
parent 45d58cab2c90281e882707667216f8eec18a3b5a
parent fe522dc2db1b20f580cf396d9d7fafed795324f7
author Fan Zhang <zhfan@google.com> 1526063911 -0700
committer android-build-merger <android-build-merger@google.com> 1526063911 -0700

Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
am: fe522dc2db

Change-Id: I380123375af5eed570915472d4ae34402d6af006