tree 769a69fcd8a609c266da80b48d2de307c838b5cc
parent 2960b4995e7fd9dbffbb5f5d8b051bac36a030ed
parent 077d6c34ac61106fabf815805dee9f14ce7d45d6
author Bill Yi <byi@google.com> 1618384591 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618384591 +0000

[automerger skipped] Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE am: 8d76739a53 -s ours am: 67fcb65189 -s ours am: 077d6c34ac -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/1675188

Change-Id: I80cde2b433d018b3e43496c6a1ccb5b1f3072d5b