Merge "Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev am: ecab20d852 am: e130c935a4" into nyc-mr1-dev-plus-aosp
am: c0d61dec97
* commit 'c0d61dec97c9cd824a5bca5bb0d0635c5080c1d8':
Change-Id: I6f4ca09715d2aebc932f096adb1e590eac522520
This commit is contained in: