diff options
| author | Hsin-Yi Chen <hsinyichen@google.com> | 2022-05-17 07:27:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-17 07:27:41 +0000 |
| commit | a1bed43a12f0b455db97d57497644f0d8bbd199f (patch) | |
| tree | c1a2964aa3123a24ba11de7005c554ca0f893f9d | |
| parent | 1459009b2fa265975406433cd6601da8974bfd1a (diff) | |
| parent | 21e359bf80a36ada9afdb5f774b3cc59320371a6 (diff) | |
| download | vndk-a1bed43a12f0b455db97d57497644f0d8bbd199f.tar.gz | |
[automerger skipped] resolve merge conflicts of a33274db2922f007fd1278272ca20a31e0a828ec to android11-tests-dev am: 33d85680e3 am: 7f0903f5d6 am: 65e8588e48 -s ours am: 3ee7586d50 -s ours am: eeea86ed4e -s ours am: 8780905da1 -s ours am: 30bd444c9d -s ours am: 21e359bf80 -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: I0683f958a1c2897cdf6099f9e00b9baa95ae18a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions