tree b881890651c645b5ef3fde32a1ff9eb83684a7fe
parent 340b3045a6e228b65e721c8eaa67a91d221376b7
parent abd3c31ed6904573a99b6c4d5585e372783f53e6
author Xin Li <delphij@google.com> 1633655989 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633655989 +0000

[automerger skipped] Merge Android 12 am: abd3c31ed6 -s ours

am skip reason: Merged-In I2e483b7c619153b8b244b43fd61b8842cd262a47 with SHA-1 340b3045a6 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/libfmq/+/1847494

Change-Id: I5554798d62fc27b0dbb930e38403bb04f16c7f00