| commit | ef173b29c26937936a8bc89d81dc9e41f5cf6fb7 | [log] [tgz] |
|---|---|---|
| author | Les Lee <lesl@google.com> | Fri Jul 01 06:45:58 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 01 06:45:58 2022 +0000 |
| tree | 0388f679c23876b4074800d10a8f49d0feb64d48 | |
| parent | 0e063c8826e2b80f42118bc7f4a0c9dda364d1ee [diff] | |
| parent | b520b3555f59c682159a0a980e4d23fb21da4e55 [diff] |
resolve merge conflicts of 155f20a6cdf3633a1911880094e8d21031899135 to android12-tests-dev am: 559df942c8 am: a7ce9003ed am: 45263c60fa am: 2edd0e9db6 am: 830175321b am: 01b93be75c am: b520b3555f Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2141153 Change-Id: I162bae22aa97e5096c00b7e3750896d401f1c645 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>