| commit | 8b9e44ccc835aaec25aead36e95e46706a992c35 | [log] [tgz] |
|---|---|---|
| author | Dave Mankoff <mankoff@google.com> | Sat Jul 27 05:21:54 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jul 27 05:21:54 2019 -0700 |
| tree | 7d90e39487aef1a9c905a9406a98c0071cf5d5dc | |
| parent | 64f9dbebd83d16b7c15285171d22b96e4a6ed161 [diff] | |
| parent | 4fb8de24ef7c5327f26d7fe26ad80cfd43b1529d [diff] |
Merge "[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: 4fb8de24ef -s ours am skip reason: change_id I6d14db66d53a668b7cf8dd15ebb489fb3ebf4c7c with SHA1 622eeaf0d5 is in history Change-Id: I8af3c3d1e95d9ff42ff9258acc20edb40d4bc24b