diff options
| author | Steven Moreland <smoreland@google.com> | 2017-07-20 02:58:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-20 02:58:46 +0000 |
| commit | c840945a7809b1fd55621d107ce799d8af370744 (patch) | |
| tree | 55a8a8690fbe3de3497e95c7773b0422541ec470 /drm | |
| parent | 12286b2608f69c3911c40f4dc2a070097373b73f (diff) | |
| parent | 5c091dc9449b583e18656a8850a61f557dfcc945 (diff) | |
Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958
am: 5c091dc944
Change-Id: I582cc33d13d04950ca066074c292141605f3ca27
Diffstat (limited to 'drm')
| -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> |