commit | 8d7408fb74fe8f60f00f3dc7a27d29efa8f511db | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Aug 30 18:06:20 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 30 18:06:20 2022 +0000 |
tree | dd4514caf85e31ef80b564ee45edcbb73fc28f12 | |
parent | 1f84bef2dac51b89a8972bcb238e82c1931a8a54 [diff] | |
parent | 0ec38f2db62fe3ad4903c738a0f5b89ae1630b9e [diff] |
Merge "[conflict] Merge "Fix LoginActivityTest" into android11-tests-dev am: 5840ee0496" into android12-tests-dev am: 0ec38f2db6 Original change: https://android-review.googlesource.com/c/platform/cts/+/2199844 Change-Id: Ib20a9182496bf8cac8f16563d4d8416564989206 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>