tree a7a3affadf182a8c361e0e7b3142ec9c2c687f98
parent c68c1592c958d04fe825e10249d11265d1e0d1e1
parent 9a66f8324b1ae0588f6ab10e4d49eaf4f953b23d
author TreeHugger Robot <treehugger-gerrit@google.com> 1631887680 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631887680 +0000

Merge "Delay the transition to AOD1 if udfps is activated" into sc-dev am: 9a66f8324b

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

Change-Id: Ied9cb638ad79317587c23fe47d927b0e0c5c8983