| commit | a7ce9003ed918b12a7e31f52bb1787a530acf5f3 | [log] [tgz] |
|---|---|---|
| author | Les Lee <lesl@google.com> | Fri Jul 01 04:48:29 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 01 04:48:29 2022 +0000 |
| tree | a357e23d952273981f0f48077f6e4759e46415b6 | |
| parent | 8656a873853a6738a2e2e4ff06137dfbe4cf9ddf [diff] | |
| parent | 559df942c852ae030071b105e911d1754db3f928 [diff] |
resolve merge conflicts of 155f20a6cdf3633a1911880094e8d21031899135 to android12-tests-dev am: 559df942c8 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2141153 Change-Id: Id18ad120af3812f613b9b14888b96e4e90b50cfc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>