tree 156f246c1c2094220027a399164d66540bb0fd78
parent c7123d4b0e4b6710b28d1f369e3c1e918e6eb534
parent 46338558e1d5a059f390b8f43aebd42f8a7eebaa
author hughchen <hughchen@google.com> 1526492860 -0700
committer android-build-merger <android-build-merger@google.com> 1526492860 -0700

Merge "Change string from "Add device" to "Pair new device"" into pi-dev
am: 46338558e1

Change-Id: I5fa291ba3677398efcfe0f5b89f10df24463a3fa