tree 5f35e241821da5676bfc6590dafa894d0a45fc37
parent c401a022a325bb6f7fa77119690acc49d2f86c8b
parent 95631ea629ee36b55f8c55c1b99107d443ba359f
author TreeHugger Robot <treehugger-gerrit@google.com> 1625691307 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625691307 +0000

Merge changes I0b38a98a,I6f8e6ec1 into sc-dev am: 4f53440f87 am: 95631ea629

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15193438

Change-Id: I39455b485fffc2da30f185686899fe5acb2a538c