commit | 7a4d1368c4c8d46c661c503aa44bfcb8a5d5fcb3 | [log] [tgz] |
---|---|---|
author | Evan Rosky <erosky@google.com> | Wed Sep 15 02:54:33 2021 +0000 |
committer | Evan Rosky <erosky@google.com> | Wed Sep 15 02:54:33 2021 +0000 |
tree | fac48d61006e876fb370841a8b1b3761ec5737be | |
parent | 0cbd9042d96c69f845a86e57c654aa547c0035d2 [diff] |
Fix a bad merge A previous merge went in that incorrectly removed this part of another change (I993dad973ea4b273f77df5671a93cbfd9b21e808). This CL is undoing that. Bug: 183993924 Change-Id: I107e80dd733fb93d829c04a8076d9a1690547fd0 Test: atest ActivityLifecycleTests with shell transitions enabled