tree e442197f42b0223c85613fd3508d4461f7b04513
parent 7cbf10bb33c5f56450ad71b4cba9a36e2e1cde06
parent 0b7875969815c7d6307dbf961235e1959bf0ca8d
author Lev Rumyantsev <levarum@google.com> 1597697625 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597697625 +0000

[automerger skipped] 2020-08-14: merge master to rvc-dev am: 5fcd8997c2 am: 76765675a6 -s ours am: 0b78759698 -s ours

am skip reason: Change-Id I1c1265424a4674bb3270e4b859b3695b3431f670 with SHA-1 1b935b144f is in history

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

Change-Id: I7caa73d1e09d336490a8704cd2fa02d41212fb7a