From: Steven Moreland <smoreland@google.com>
Date: Tue, 18 Jul 2017 20:16:08 +0000 (+0000)
Subject: Merge "Reference nativehelper/jni.h as jni.h" am: 28c9177f66
X-Git-Tag: android-x86-9.0-r1~245^2~1^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9cd659c8dcd1f48b6d42f4463022ee6fac92e3eb;p=android-x86%2Fframeworks-native.git

Merge "Reference nativehelper/jni.h as jni.h" am: 28c9177f66
am: 6ac4d2a42b

Change-Id: Id1fd8abd06cfb80ccae1304d2a3005b27ba95008
---

9cd659c8dcd1f48b6d42f4463022ee6fac92e3eb