tree 57f1f8ce12e2f73574dbce213d563d412342a383
parent 44270d423d7fd1c4c87b26bd4e6c1d014b882b03
parent 9faf53e42aa8382577529a0b501af75d36db4e72
author Bryan Ferris <bferris@google.com> 1588714956 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588714956 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict app transition maximum duration" into qt-dev am: b60d52fd70 am: e4c1da0634 -s ours am: 9faf53e42a

Change-Id: I13fcb866c402c1b0ed8233582fc1d7a40d10c707