Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944

am: c840945a78

Change-Id: I654e14f0d1b495450db81592a2e564e308746350

diff --cc core/jni/AndroidRuntime.cpp
Simple merge

diff --cc core/jni/android/graphics/BitmapFactory.cpp
Simple merge

diff --cc core/jni/android/graphics/Graphics.cpp
Simple merge

diff --cc core/jni/android/graphics/pdf/PdfRenderer.cpp
Simple merge

diff --cc core/jni/android/opengl/util.cpp
Simple merge

diff --cc core/jni/android_hardware_SensorManager.cpp
Simple merge

diff --cc core/jni/android_hardware_camera2_CameraMetadata.cpp
Simple merge

diff --cc core/jni/android_media_AudioSystem.cpp
Simple merge

diff --cc core/jni/android_os_Parcel.cpp
Simple merge

diff --cc core/jni/android_util_Process.cpp
Simple merge

diff --cc core/jni/android_view_Surface.cpp
Simple merge

diff --cc core/jni/android_view_SurfaceControl.cpp
Simple merge

diff --cc core/jni/android_view_ThreadedRenderer.cpp
Simple merge

diff --cc core/jni/com_google_android_gles_jni_EGLImpl.cpp
Simple merge

diff --cc media/jni/android_media_MediaMetadataRetriever.cpp
Simple merge

diff --cc rs/jni/android_renderscript_RenderScript.cpp
Simple merge

diff --cc services/core/jni/com_android_server_VibratorService.cpp
index 45e9cc7,810d785..0370490
--- 1/services/core/jni/com_android_server_VibratorService.cpp
--- 2/services/core/jni/com_android_server_VibratorService.cpp
+++ b/services/core/jni/com_android_server_VibratorService.cpp
@@@ -18,10 -18,9 +18,10 @@@
  
  #include <android/hardware/vibrator/1.0/IVibrator.h>
  #include <android/hardware/vibrator/1.0/types.h>
 +#include <android/hardware/vibrator/1.1/IVibrator.h>
  
  #include "jni.h"
- #include "JNIHelp.h"
+ #include <nativehelper/JNIHelp.h>
  #include "android_runtime/AndroidRuntime.h"
  
  #include <utils/misc.h>

diff --cc services/core/jni/com_android_server_am_BatteryStatsService.cpp
Simple merge

diff --cc services/core/jni/com_android_server_input_InputManagerService.cpp
Simple merge

diff --cc services/core/jni/onload.cpp
Simple merge