| commit | c25954e3971323fdb8f960512fa5a0c591fd8f75 | [log] [tgz] |
|---|---|---|
| author | Vinh Tran <vinhdaitran@google.com> | Fri Jun 10 22:21:24 2022 +0000 |
| committer | Vinh Tran <vinhdaitran@google.com> | Fri Jun 10 19:38:31 2022 -0400 |
| tree | 7fc65be5450c0fac024ea73a069edbd6cc5a8ea8 | |
| parent | 3937f152ff07ed67047ecef59851da42e4fcf57d [diff] | |
| parent | 7172e6217a1e5b3a503d3ecf4829a556a2872887 [diff] |
[conflict] Merge "Unset platform_apis when sdk_version is set" into sc-v2-dev am: 7172e6217a Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/18726720 Change-Id: I6ccedff2f32047c274e75da6bd22c198d98f87d3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>