tree 817f2cedeee2858ccf8c7bc361b1129cf24917e5
parent 8dced82d586145ff8b9c8ffe5bdad582a67b04d6
parent 4ea21906c9069e3b4b07cf797a9438143b989a71
author Xin Li <delphij@google.com> 1599859668 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599859668 +0000

[automerger skipped] Merge Android R am: 836605a043 -s ours am: 6bd325eec8 -s ours am: 5ef5665580 -s ours am: d10048e9c5 -s ours am: 4ea21906c9 -s ours

am skip reason: Change-Id Ia69b5e8baa3c3902095245d7747bb3d44f4b4094 with SHA-1 e90cc300b4 is in history

Original change: https://android-review.googlesource.com/c/platform/external/flatbuffers/+/1421755

Change-Id: I4828927d11ebcfd662012ff84a8363b81e8a5e0b