commit c202a940280b5b5b44842e87b07aff878a72aae9
author Atanas Kirilov <akirilov@google.com> Mon Jun 04 20:24:25 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 04 20:24:25 2018 +0000
tree c264ca673b97c1461c87967392a39f52798f957a
parent 30d0145ead78c7a57880455e1e15d354a0005aef
parent 8bc91c3b8bb8b02f454acaad2c9e914d371c663a

Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into cw-f-dev

* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71
  Merge translations of Bluetooth confirmation text