tree b58fa05675efd19e73b580275410a7afd063d6cf
parent e8d19c1221e67af16b5ab2d3b0903d02c52b3b94
parent 4ae9fed51db9681e0e36e1ba63b6f5cedf7bddf0
author zouwenbo <zouwenbo@xiaomi.com> 1570228606 -0700
committer android-build-merger <android-build-merger@google.com> 1570228606 -0700

[automerger skipped] Merge "DO NOT MERGE Test: .ActivityManagerAmStartOptionsTests: Waiting for SingleTaskActivity transition idle" into pie-cts-dev am: 0b857c60d4 -s ours am: 5f13ca0895 -s ours am: c2309dac5b am: be32a6322d am: 92a40ce3a4
am: 4ae9fed51d -s ours
am skip reason: subject contains skip directive

Change-Id: I53b58421794c43b82ad47f75c306afda6b5a43d3