tree 8a3f87c5ed8696003d8c03a6a929ed1a4a215725
parent ec795a609d53fc19b1fe735cd88c237721e1eca5
parent 369a8fdfe6cb2ee715942cfdb6a0d07fbca7c494
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1521795813 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1521795813 +0000

Merge "Merge "Bluetooth: Enable in-band ringing in vibration mode (1/4)" into pi-dev am: cbb8cd77d5 am: e58e7bf155"