tree 769a69fcd8a609c266da80b48d2de307c838b5cc
parent c7cce3d4e5045726d187a7eb17740af5fc04a196
parent 57e6121438eebba3edf2408f30cc4d5afb230cf2
author Bill Yi <byi@google.com> 1618363807 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618363807 +0000

[automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: 5ef5916839 -s ours am: 57e6121438 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idc553bb4ea052c04a77419846d52d6f60de31fae