OSDN Git Service

Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into nyc-mr1-dev
authorAtanas Kirilov <akirilov@google.com>
Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 4 Jun 2018 20:24:25 +0000 (20:24 +0000)
commit07bcf55ae8bfd7fe6c9c6c9a30534b9c4f7f8dbb
tree16bb50876d87561dd63d9e607cb86aaba895c056
parent93ee1bd17e7a06adb8e1d6cbc45d9acc7c85f596
parent2d1bae1bd837cdd5d14b7b0656da4e7b392cec1f
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into nyc-mr1-dev

* changes:
  [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