commit | 4c4b690c9cf2f23ec3024bb25f57260e9d31060b | [log] [tgz] |
---|---|---|
author | Dave Mankoff <mankoff@google.com> | Sat Jul 27 04:58:24 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Jul 27 04:58:24 2019 -0700 |
tree | 4ae879599804aeffc4124b971be0d4c8fc946d26 | |
parent | 8f50558948410b6d36a751f1a00ee89fb555ea28 [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: I10dbbf5d4c6b5ea0a9b38ccf01f5b976e60659c2