tree 5885621c1e1e7badf4b60214970745dfe553e5e9
parent 4d1051308b7a04fbf65c6cd099374e8695e659cc
parent c5c8b2cdb53c9934b8f9c5e46915fcfb1a39b77e
author Chris Fries <cfries@google.com> 1560536438 -0700
committer android-build-merger <android-build-merger@google.com> 1560536438 -0700

Merge "Revert "dumpstate: Always vibrate, even in DND"" am: 1453e8a259
am: c5c8b2cdb5

Change-Id: I9e2907791a4dc9fb71365dcaf7399c4cb381e97f