tree 29cefbaeedef99ed37ada1c92e8b7b13d0772116
parent 54c1af806fcfb65ea15e7c263caaa9f7c1f37ee9
parent 29aef52be370b7235a4d9442d4b023e42a732c5b
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1528759432 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1528759432 +0000

[automerger] Fix some issues with haptic am: 29aef52be3

Change-Id: Icb16c1ee3828820187f023bd351e2a2720e9d300