OSDN Git Service

Merge "Don't convert all sounds to vibrations in vibrate mode" into oc-mr1-dev
authorJulia Reynolds <juliacr@google.com>
Tue, 26 Sep 2017 23:11:38 +0000 (23:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Sep 2017 23:11:38 +0000 (23:11 +0000)
am: 169f367125

Change-Id: Iaa1818e4d04f913c15da06a8dbbc5993d0e0a7e0


Trivial merge