tree 4c8109bba6481ebd3688684ce74a4941d99b03df
parent 03c6d371aa91febe7beafcfb968d1de403615b12
parent 576351dbb410a7bc9fb49c25a25a4a03a74f35c6
author Lucas Dupin <dupin@google.com> 1543228707 -0800
committer android-build-merger <android-build-merger@google.com> 1543228707 -0800

Merge "Fix the behavior of keyguard bouncer in a corner case" am: 6997660506
am: 576351dbb4

Change-Id: Iefd1d3ae5e8b1688c339a8b91bbbcf5de2131767