tree 963179088a239c1b8d63189ce087e50127a7ebf8
parent dfe4cc74f79ec951b8ad2beb5f8cee64191c4094
parent e0eeafcb5dec33de3233e5884c513016c4b516a8
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1527186139 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1527186139 +0000

[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d

Change-Id: I1ba9495afe9e105926ad407442d732f2c6e92cf5