commit | d29b3cf7d0543ec59b8ef160b30aaa1516ef8c08 | [log] [tgz] |
---|---|---|
author | Dave Mankoff <mankoff@google.com> | Sat Jul 27 04:58:32 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Jul 27 04:58:32 2019 -0700 |
tree | 895be70ea99194307bc24e0de3ea15a60f232508 | |
parent | 3d624e4ed4f2e79fa72b0f518dcf6c2677d1260d [diff] | |
parent | 8df3caae911a4032c21a24f3cab9488299a88952 [diff] |
[automerger skipped] Merge "Do not allow the FalsingManager sesion to start when AOD is showing." into qt-dev am: 000415be6e -s ours am: 8df3caae91 -s ours am skip reason: change_id I6d14db66d53a668b7cf8dd15ebb489fb3ebf4c7c with SHA1 622eeaf0d5 is in history Change-Id: I6fac602c7dbed5c8ce6fdf06126699ca98fdefa0