| commit | 3ab8f5c217bc2c9f77034069c7886ae81c46d1eb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Aug 31 04:36:57 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 31 04:36:57 2022 +0000 |
| tree | eb6c2af33466020bd6f7b5e95dc0694116e5fd58 | |
| parent | 1c2b898c1603cecb59656edbc49d4c66e9b2fe7d [diff] | |
| parent | fafd71d217d2c1da6e1fbe3514b717855ad0c4a9 [diff] |
Merge "[conflict] Merge "Fix SessionLifecycleTest" into android11-tests-dev am: 7e8adf861b" into android12-tests-dev am: fafd71d217 Original change: https://android-review.googlesource.com/c/platform/cts/+/2201735 Change-Id: If96591f2ee5b5cb1dd6565af3d7bc0b282537868 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>