| commit | 830175321b33aaed4c5b37ced4c0596a7f98d6d3 | [log] [tgz] |
|---|---|---|
| author | Les Lee <lesl@google.com> | Fri Jul 01 05:46:54 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 01 05:46:54 2022 +0000 |
| tree | 484b76e2b5a1dc6666e85ae7f9c5ff98ed9dbef1 | |
| parent | 3b9f5d255350744d745d45aa575c221323e6998f [diff] | |
| parent | 2edd0e9db6d4d50dd009daa4b6a07921111c36ee [diff] |
resolve merge conflicts of 155f20a6cdf3633a1911880094e8d21031899135 to android12-tests-dev am: 559df942c8 am: a7ce9003ed am: 45263c60fa am: 2edd0e9db6 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2141153 Change-Id: Ib315b4a57f99f998c4f0801efba5d52d45703216 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>