OSDN Git Service

Merge "DO NOT MERGE ANYWHERE Vibrator: Allow priority vibrations in low-power mode...
authorTyler Freeman <fuego@google.com>
Fri, 16 Jun 2017 23:47:09 +0000 (23:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Jun 2017 23:47:09 +0000 (23:47 +0000)
am: b5e0a5bec3  -s ours

Change-Id: I8d9efd6c0ece8fcb1c867d123d1cc6004d57d05b


Trivial merge