Skip to content
Commit a7643f22 authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Migrate haptic to view model and out of legacy...

[automerger skipped] Merge "Migrate haptic to view model and out of legacy components." into udc-d1-dev am: ab303173 -s ours

am skip reason: Merged-In Ie7181b448b74e4f7322cfad59eced1ac872a9b85 with SHA-1 0b64d441 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23987611



Change-Id: Ia703309a13b474a4f5e9eb0348e19845c7524eb3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b24bfc1d ab303173
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment