OSDN Git Service

Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into nyc-mr2-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)
commita762677e27d886bd8682c6d860c6942032738428
tree3703859e1859a9a99ae690512fdb4e4b803a0fc0
parent48fd185e3b70e8a2bc5d91b59f75a9f38db91149
parentc874b450afe2b74bb382c8cf39e458050c064d1a
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into nyc-mr2-dev

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