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