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