commit | 77041ef7259486da7ed00f4f45289dbbc62e5f9d | [log] [tgz] |
---|---|---|
author | Kevin Chyn <kchyn@google.com> | Fri Jul 16 22:02:09 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 16 22:02:09 2021 +0000 |
tree | 383724908c51104db1fae3bdc15721a5a8e95b09 | |
parent | 77ee61026ad840d783cb09be7f49aa75fe722af2 [diff] | |
parent | a7b91a1c27a39b7026406ee218ba37a047a11256 [diff] |
Merge changes from topic "biometric-haptic" into sc-dev am: a7b91a1c27 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15305458 Change-Id: Ifd1170ec68c475d2064572378f02a06224734e1b