tree 4c0118074070637832c2a87d6ad1d03ad5f77930
parent d3d41774f9a228a8164ee8787d3d249014b040ae
parent 9ca74917c3c2959ed0ac66b704f26a53da75036f
author Daniel Colascione <dancol@google.com> 1574215844 -0800
committer android-build-merger <android-build-merger@google.com> 1574215844 -0800

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

Change-Id: Iaaacc4df06894cb9a97054e553b1bb9019847097