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