tree 0e6e12d8bdfe61b2595345ea1ddb2f2d13cf1eb0
parent 02d86bddab2f1ad09fb15ba9727af74da7141b4f
parent 6085e49a5a5bbaf359c03afeaf76b1267a635e4f
author Lucas Dupin <dupin@google.com> 1586279500 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586279500 +0000

Merge "Update bouncer fingerprint lockout logic" into rvc-dev am: f7ef70e669 am: 6085e49a5a

Change-Id: I2be313c9ae90b6cfed0b6d1f2e47a243e3b81c34