| commit | e3467e1ef5538ed6476dccc416a9b765c07791fc | [log] [tgz] |
|---|---|---|
| author | Dave Mankoff <mankoff@google.com> | Sat Jul 27 05:26:41 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jul 27 05:26:41 2019 -0700 |
| tree | 785e0d4b08fe0a94d81865a18cf6587fd7feaea5 | |
| parent | 5e3c746951dac053ff17baa67fe2dfb0b090e508 [diff] | |
| parent | 64f9dbebd83d16b7c15285171d22b96e4a6ed161 [diff] |
Merge "[automerger skipped] Merge "Do not allow the FalsingManager sesion to start when AOD is showing." into qt-dev am: 000415be6e am: cc87595ed5 -s ours am: ece6c47e7a -s ours am: 64f9dbebd8 -s ours am skip reason: change_id I6d14db66d53a668b7cf8dd15ebb489fb3ebf4c7c with SHA1 622eeaf0d5 is in history Change-Id: I15af8981a4eb5aad9b8f4a6864db67ee29dbd486