| commit | 7f0903f5d6c611da4ed3c8f95060bf7499acb284 | [log] [tgz] |
|---|---|---|
| author | Hsin-Yi Chen <hsinyichen@google.com> | Thu Oct 21 03:34:35 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 21 03:34:35 2021 +0000 |
| tree | f90fe98a6a5e3a4063b18618efca2ae21cd52a98 | |
| parent | 8dc2b827c2212ae6a97320ab4442bb438c36e67d [diff] | |
| parent | 33d85680e3731ada0b488bfa234dcfedbef6cabb [diff] |
resolve merge conflicts of a33274db2922f007fd1278272ca20a31e0a828ec to android11-tests-dev am: 33d85680e3 Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/1744837 Change-Id: I5c4f60890063ef50ac8b806657eec612727f7a3a