OSDN Git Service

Merge "Bluetooth: Enable in-band ringing in vibration mode (1/4)" into pi-dev am...
authorJack He <siyuanh@google.com>
Fri, 23 Mar 2018 09:02:36 +0000 (09:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Mar 2018 09:02:36 +0000 (09:02 +0000)
commit369a8fdfe6cb2ee715942cfdb6a0d07fbca7c494
treead0447d8b81a08332fb2d849bad88d4426263323
parentd58a379293dcb964ef012fda12ec1ff2bf34fb2b
parente58e7bf155aa81976be7bf8b92c0c55c6408c5d9
Merge "Bluetooth: Enable in-band ringing in vibration mode (1/4)" into pi-dev am: cbb8cd77d5
am: e58e7bf155

Change-Id: Iaf338b1dcc1036deb9fb5a67a12f4ae1b63e032b
services/core/java/com/android/server/audio/AudioService.java