tree 2f6194e59424e5ab6f4504c8ca0f389119a11622
parent 9faf53e42aa8382577529a0b501af75d36db4e72
parent 135004114a9af0c2b28cecfbe45f39a547a24141
author Bryan Ferris <bferris@google.com> 1588714427 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588714427 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into pi-dev am: 7a77f798b6 -s ours am: 2ad9d38a63 am: 135004114a -s ours

am skip reason: subject contains skip directive

Change-Id: Ifb094858a0a540bab00617fe6564740391e89e07