tree 760d0ab6061fc8ee2134c2276256dae641c839ea
parent 49a272a506e346b1f4a81362ea40e39c435ecdf7
parent 9e8c7bd6454ed8af48cb108088e4d56fb13e5000
author Louis Chang <louischang@google.com> 1593788256 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593788256 +0000

Merge "Do not count AOD showing changes as keyguard's" into rvc-dev am: 9e8c7bd645

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

Change-Id: Ib81d445b73764202b73f6dab28969fcb058ac2ef