diff options
| author | Hsin-Yi Chen <hsinyichen@google.com> | 2022-05-17 05:15:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-17 05:15:00 +0000 |
| commit | 3ee7586d50c14dede349d27e7adc60db081f3f7b (patch) | |
| tree | c1a2964aa3123a24ba11de7005c554ca0f893f9d | |
| parent | a0d4895890a10288dcd0c88e861c3dc489718b0a (diff) | |
| parent | 65e8588e48f9c6ad0337eec7c2b128ffedbe1c6b (diff) | |
| download | vndk-3ee7586d50c14dede349d27e7adc60db081f3f7b.tar.gz | |
[automerger skipped] resolve merge conflicts of a33274db2922f007fd1278272ca20a31e0a828ec to android11-tests-dev am: 33d85680e3 am: 7f0903f5d6 am: 65e8588e48 -s ours
am skip reason: skipped by user dshi
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/1744837
Change-Id: Iba31545680ea8e399037f81727847b15e7f05c46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions