tree 9c8d0b47c883be9b2ba9463e1f0f7df7cab7b37b
parent 44cb1486f3a57c5ce969848b98a3cb9a31bb1bdd
parent 4c6a49ed4770cd26158a9e910577241f6d64f842
author Erik Wolsheimer <ewol@google.com> 1495736577 +0000
committer android-build-merger <android-build-merger@google.com> 1495736577 +0000

Merge "Respect empty vibration effect configs in PhoneWindowManager and VibratorService" into oc-dev
am: 4c6a49ed47

Change-Id: Ib92f2dbad240bae9f46a23aa61eb2b7d09a96896