tree fd4c4891cf28abb1f13d10538117f88fced00b3c
parent fe43d4ce8d1326d94db4bbb0f944033f7d0217bd
parent abe08c462738815422a5b5260ccffbc832a53719
author Dimitry Ivanov <dimitry@google.com> 1462225939 +0000
committer android-build-merger <android-build-merger@google.com> 1462225939 +0000

Merge changes from topic \'reset-native-loader\' am: a6513729ae
am: abe08c4627

* commit 'abe08c462738815422a5b5260ccffbc832a53719':
  Fix check_jni_compiler tests
  Revert "Disable tests after latest nativeloader changes."
  Reset NativeLoader on DestroyJavaVM

Change-Id: I802603c808f63fd6d4506227b5f3a6f42e347f53