| commit | 33d85680e3731ada0b488bfa234dcfedbef6cabb | [log] [tgz] |
|---|---|---|
| author | Hsin-Yi Chen <hsinyichen@google.com> | Thu Jun 24 04:59:18 2021 +0000 |
| committer | Hsin-Yi Chen <hsinyichen@google.com> | Thu Jun 24 05:07:15 2021 +0000 |
| tree | a3ae2ef67e573340709aae359f9b0886a488e2e9 | |
| parent | b9bb7c6b6e7b49f09142b9c758754911a00304b5 [diff] | |
| parent | a33274db2922f007fd1278272ca20a31e0a828ec [diff] |
resolve merge conflicts of a33274db2922f007fd1278272ca20a31e0a828ec to android11-tests-dev Bug: 191873666 Test: atest vts_vndk_dependency_test Change-Id: I87e6e46bf13934fe378bf6a09aaf65c558821ea2