[automerger skipped] Merge "Fixes a system crash in VibratorService on x86 hosts" am: 5ed0e55859 am: 5d8f3ae57d
am:01676b2564-s ours am skip reason: change_id If50f68df9579f84bddc9d70a0a30cd73f4485e96 with SHA1e2e5a31362is in history Change-Id: I8de0517621facad6f880685b67979d235a3fc815
This commit is contained in: