| commit | 44be03ab5f85a8557fdaca0dd1c75efeab7144e9 | [log] [tgz] |
|---|---|---|
| author | Dave Mankoff <mankoff@google.com> | Sat Jul 27 05:35:08 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jul 27 05:35:08 2019 -0700 |
| tree | 785e0d4b08fe0a94d81865a18cf6587fd7feaea5 | |
| parent | e3467e1ef5538ed6476dccc416a9b765c07791fc [diff] | |
| parent | 8b9e44ccc835aaec25aead36e95e46706a992c35 [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: 8b9e44ccc8 -s ours am skip reason: change_id I6d14db66d53a668b7cf8dd15ebb489fb3ebf4c7c with SHA1 622eeaf0d5 is in history Change-Id: I9cdb16b7ddb66ede5aa8cdc63165548924f85b8b