tree fa7b053a2da7a0397edd9807c5b26a5fd73ee0f9
parent d62423d3d933e483793adfad3cb5314e0c718183
parent 979d8512e3bc0704ca6736fa296c2f752c10d056
author Alexey Kuzmin <alexeykuzmin@google.com> 1566420034 -0700
committer android-build-merger <android-build-merger@google.com> 1566420034 -0700

Merge "Merge "Mark USAGE_NOTIFICATION_EVENT vibrations as notifications" into qt-r1-dev am: 8e70a2826e am: 323b7e6f9c" into qt-qpr1-dev-plus-aosp
am: 979d8512e3

Change-Id: I75b17210508911ca2779ec81ea0516ad038b722f