[automerger skipped] Merge "vibrator: use package as name" am: 91a5aa4e am:...
[automerger skipped] Merge "vibrator: use package as name" am: 91a5aa4e am: 8aa0dd83 am: ef9e0c98 -s ours
am skip reason: Change-Id I52959482898f329ad1b3a3a5b345a0c6dc72197d with SHA-1 07f26946 is in history
Change-Id: If2f3389cd189bbf57db2f96c594603c6d8751e2d