OSDN Git Service

Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into cw-f-dev
authorAtanas Kirilov <akirilov@google.com>
Mon, 4 Jun 2018 20:24:37 +0000 (20:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 4 Jun 2018 20:24:37 +0000 (20:24 +0000)
commitec357c4782d3135c5a60be718101ffa3a4b4652e
treec264ca673b97c1461c87967392a39f52798f957a
parentc202a940280b5b5b44842e87b07aff878a72aae9
parente9345782e21bb46a1ce1bd51e46705326ce0f6bb
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into cw-f-dev

* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293
  [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