tree c264ca673b97c1461c87967392a39f52798f957a
parent 70643c1bf44e8b65a34a1c85472eb0e9632864aa
parent 7304aaf2936910059f5011d7404ea43593cdaa93
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1526936403 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1526936403 +0000

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293

Change-Id: Ia02c7c5d5e52abcd2ecfbf0d9399efad31c3575e