tree 9f5c675f8e7da2c7b05af152b6e2a119501df417
parent 56229b3774ee6d201c56cccc47d52ae303b68074
parent 778fc73c02c31c1157112c4668d4b12d80b83366
author Devin Moore <devinmoore@google.com> 1594244287 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594244287 +0000

Merge changes from topic "testing" am: 8b8d4d27d6 am: 778fc73c02

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

Change-Id: I074ade3aa24faf8347ab35e53fba4cb9af63fc61