| commit | a1a1ed85855f83b4fdd5abc3a077fe034635b679 | [log] [tgz] |
|---|---|---|
| author | Kevin Chyn <kchyn@google.com> | Fri Jul 16 22:06:26 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 16 22:06:26 2021 +0000 |
| tree | 1833dd439663dadf35a3ccf509b1731facc582a3 | |
| parent | 5041120c5326d93fc8c3c4e0ad5164d3f184d6fe [diff] | |
| parent | 77041ef7259486da7ed00f4f45289dbbc62e5f9d [diff] |
Merge changes from topic "biometric-haptic" into sc-dev am: a7b91a1c27 am: 77041ef725 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305458 Change-Id: Ic3dda45eb8782cc8f4459beb1992136e56f7990d