tree 1322699ca6ace242d3e80b6c2c7df5a4a5deea5f
parent 0f6700acb5fa3d3712b145e6d3f7edf6412626dd
parent 260710644c1663793f3682366366b8340370ea77
author Daniel Colascione <dancol@google.com> 1574205938 -0800
committer android-build-merger <android-build-merger@google.com> 1574205938 -0800

Merge "Port CRITICAL_JNI_PARAMS from internal master" am: f2fe7f0b61
am: 260710644c

Change-Id: I03e2c19b3f158ab9303ee027a6e9e106f726ab4c