OSDN Git Service

Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev
authorAtanas Kirilov <akirilov@google.com>
Mon, 4 Jun 2018 20:24:34 +0000 (20:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 4 Jun 2018 20:24:34 +0000 (20:24 +0000)
commit438cf9da5223b1b430e4082b8b2b7f271bad81be
tree190bee8fad399810242dbee88df12615f5d72a60
parent9e626734bb043aa8e0bd367e317113e53f04aebf
parent6351f9021997cf3708371c510625b986a093b311
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev

* changes:
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 732b65ca4d
  Merge translations of Bluetooth confirmation text