tree 78970163f8b87e42c9e1c496dee1f2c9189357b1
parent ef65e581e3fd0c82f5c485f89505f2b798d543e4
parent faea7d4b12df157baa9dc6c4a0183b6f54e665b8
author Treehugger Robot <treehugger-gerrit@google.com> 1627706256 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1627706256 +0000

[automerger skipped] Merge "Generate fmq java-source." am: 555e9872f5 am: a0b00c4b31 -s ours am: 1828c07960 -s ours am: faea7d4b12 -s ours

am skip reason: Merged-In Ie1f7e8f9a36a1f09258581d484843f372f56e03e with SHA-1 0fc5b6ce50 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1783409

Change-Id: I5ff7ec8aa5b0475ca91d9f6ccce0488c4a9b55f8