tree 69b06942762660f58944bc563b1eed0299750af3
parent c97834a65a69b4bc251f66a051d50414a03de824
parent ef1c47bb393908a57fcd199b1fe328e0b1d9d3e7
author Joshua Schwarz <joshuaschwarz@google.com> 1524617807 -0700
committer android-build-merger <android-build-merger@google.com> 1524617807 -0700

Merge "Merge "Remove testFinishActivityWithMoveTaskToBackAfterStop from CTS." into oreo-cts-dev am: e6ce93935a" into oreo-mr1-cts-dev
am: ef1c47bb39

Change-Id: Ib2b74f498bb26af29ab740ef1df8903a129d93ba