[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: b095fc5cf5 -s ours

am skip reason: Change-Id Icfed402af0246b4d470ebdc6270ffa8c37e73fe0 with SHA-1 d17bbe399f is in history

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

Change-Id: I3e7f4f40db0bcf022a7e6f40f1b53457c98cc294
tree: 84ce3ddeeaa9b3cd0188c4e271791c149c0c7c35
  1. base/
  2. benchmarks/
  3. include/
  4. tests/
  5. Android.bp
  6. EventFlag.cpp
  7. FmqInternal.cpp
  8. OWNERS
  9. PREUPLOAD.cfg
  10. TEST_MAPPING