Skip to content
Commit 1fbbe485 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Set unlockAmount = 1f when keyguardGoingAway = false." into tm-qpr-dev... 

Merge "Set unlockAmount = 1f when keyguardGoingAway = false." into tm-qpr-dev am: 3fd2b83e am: 2c4cde7c

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



Change-Id: Ibdb1e22d344a44b02faf6141c4c016e56f0156a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ccfc86ed 2c4cde7c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment