tree 16bb50876d87561dd63d9e607cb86aaba895c056
parent 07bcf55ae8bfd7fe6c9c6c9a30534b9c4f7f8dbb
parent 7304aaf2936910059f5011d7404ea43593cdaa93
author Atanas Kirilov <akirilov@google.com> 1528143877 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1528143877 +0000

Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into nyc-mr1-dev

* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
  Merge translations of Bluetooth confirmation text