commit b351226f3c3dd8a592eb4b9fadd7e3712611a65a
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 06 00:09:36 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 06 00:09:36 2022 +0000
tree b9e76f7932dbb7f0f363d65a1f5e26ae4888670d
parent 726eb2a795b0679e8f203e360cb75b15750beab3
parent b7e127880ff97ed88e9f3131199dd6b06ffa1dd4

[automerger skipped] Merge "DO NOT MERGE: cts: Re-launch the desired activity after screen-on on TVs." into pie-cts-dev am: bf3d81d411 -s ours am: 3b1cba2d3b -s ours am: 500750bbe6 -s ours am: b2f7aafb0b -s ours am: 5cb4a28ea7 -s ours am: f5fecb7979 -s ours am: b7e127880f -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/cts/+/2019125

Change-Id: I99d0f0733651e8ca8173d92ff897ba7a1e08172f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>