Skip to content
Commit 1e7334fb authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Allow UDFPS to be triggerd from AOD_PAUSED state" into tm-qpr-dev am:... 

Merge "Allow UDFPS to be triggerd from AOD_PAUSED state" into tm-qpr-dev am: 631554e2 am: 1ea9048f

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



Change-Id: I1bb56ec3b672c6e68d8a009c923ba679ca0e8fa3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b20ffb0 1ea9048f
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