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