[automerger skipped] Merge "Merge ab/7061308 into stage." into stage-aosp-master am: 533fbfb117
-s ours
am skip reason: Change-Id I1512f0aee1f960e809a42448b9aafed0de3dbc2a with SHA-1 2be17732e7
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13658370
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic4930126e19d855ba6cd216cce41f49832a65302
This commit is contained in:
commit
17b1890491