tree d698254009e54f08ebb843da6d55397d5d3a09e6
parent 6a668c56303af27ad08eed08d1ff3c2780055478
parent 30d0145ead78c7a57880455e1e15d354a0005aef
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1527186155 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1527186155 +0000

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead

Change-Id: I164f89c547721b6b02fcd2bf57b224c92816e25b