diff options
| author | Steven Moreland <smoreland@google.com> | 2017-07-20 03:05:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-20 03:05:02 +0000 |
| commit | 9f430b2782849090d2e5e3737304cd26724366fa (patch) | |
| tree | 80e2e9cbd26b7805380828737e9b0553fbafda23 /drm/jni/android_drm_DrmManagerClient.cpp | |
| parent | fe4ec9e9465eb4859845aeea5f1dfbb70b4c9d00 (diff) | |
| parent | c840945a7809b1fd55621d107ce799d8af370744 (diff) | |
Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944
am: c840945a78
Change-Id: I654e14f0d1b495450db81592a2e564e308746350
Diffstat (limited to 'drm/jni/android_drm_DrmManagerClient.cpp')
| -rw-r--r-- | drm/jni/android_drm_DrmManagerClient.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drm/jni/android_drm_DrmManagerClient.cpp b/drm/jni/android_drm_DrmManagerClient.cpp index 63fe8acedd54..52ea8e3b161f 100644 --- a/drm/jni/android_drm_DrmManagerClient.cpp +++ b/drm/jni/android_drm_DrmManagerClient.cpp @@ -19,8 +19,8 @@ #include <utils/Log.h> #include <jni.h> -#include <JNIHelp.h> -#include <ScopedLocalRef.h> +#include <nativehelper/JNIHelp.h> +#include <nativehelper/ScopedLocalRef.h> #include <android_runtime/AndroidRuntime.h> #include <drm/DrmInfo.h> |