From: Igor Murashkin <iam@google.com>
Date: Wed, 28 Sep 2016 23:24:41 +0000 (+0000)
Subject: Merge "jni: test CriticalNative with generic jni" am: 73dac6e366
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=54232b5596f3065bbbecc71030fd8e05367b043a;p=android-x86%2Fart.git

Merge "jni: test CriticalNative with generic jni" am: 73dac6e366
am: 54fa0da6c3

Change-Id: I904b1b8135dccbfaf9fcaec0fd3ea62e6fd88712
---

54232b5596f3065bbbecc71030fd8e05367b043a