[automerger skipped] Merge "Do not animate padlock when fp" into rvc-d1-dev am: 3457f40589 am: cf15d4c609 -s ours

am skip reason: Change-Id If99d5b20d0f69491d38cfdbc21dfa8d2fe2d0edb with SHA-1 a7f7936590 is in history

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

Change-Id: I503c00f5c74324cea3606947273ee42baf881a4f
This commit is contained in:
TreeHugger Robot
2020-07-29 20:38:11 +00:00
committed by Automerger Merge Worker

Diff Content Not Available