tree 3d1e1fc795d53932d07b517c7c10144feb014fca
parent 4eea85634f3423e7d278c68ca6f72e93e087e77e
parent 30853736bc688524aae446c8c1729111b32cba40
author Steven Moreland <smoreland@google.com> 1507219883 +0000
committer android-build-merger <android-build-merger@google.com> 1507219883 +0000

Merge "Vibrator service -> .bp" am: 3a8a6f9147 am: 08853ff3ae am: 81399a45d3
am: 30853736bc

Change-Id: I11c513170ce02a7cd6ef5c4cf6e1230e7b60e5ea