[automerger skipped] Merge changes from topic "rkp-factory-tool" am: 0ab5ef3ff7
am: a23de7b98d
-s ours am: 620aff6b4f
-s ours
am skip reason: Merged-In Icf9cfa165fbccb24b36b03ff3ce729a7e9c44cfd with SHA-1 415f0ce4fe
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1748602
Change-Id: I661c23c944cff92893974867dfdb2bd0d397883d
This commit is contained in:
commit
a7e32b2922