tree 347251004954e4ea5e2a2af7ab4b628e62abfc98
parent 9a3ae577163d4346e353028c24394ebb7b4fd63a
parent 462e65a9ac7754b69728d3bb5cdd2c6ab75f77bd
author Lev Rumyantsev <levarum@google.com> 1595355079 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595355079 +0000

[automerger skipped] 2020-07-20: merge master to rvc-dev am: 60a03412fc -s ours am: 462e65a9ac -s ours

am skip reason: Change-Id Ib27399b76c272c404a0a153597bfe8fd101142fa with SHA-1 9c7d462c31 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/native_bridge_support/+/12195385

Change-Id: Ic1025f39e8c24b50a2b00939c1b33f31cfdd5a6a