| commit | 65e8588e48f9c6ad0337eec7c2b128ffedbe1c6b | [log] [tgz] |
|---|---|---|
| author | Hsin-Yi Chen <hsinyichen@google.com> | Mon May 16 22:49:25 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 16 22:49:25 2022 +0000 |
| tree | f90fe98a6a5e3a4063b18618efca2ae21cd52a98 | |
| parent | 49042808c3cb31dfa4e80ab543e380dde33ba3a2 [diff] | |
| parent | 7f0903f5d6c611da4ed3c8f95060bf7499acb284 [diff] |
resolve merge conflicts of a33274db2922f007fd1278272ca20a31e0a828ec to android11-tests-dev am: 33d85680e3 am: 7f0903f5d6 Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/1744837 Change-Id: I02194648b02b268236a46ec8958b1853cbf5fdf4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>