diff options
| author | Elliott Hughes <enh@google.com> | 2015-09-24 10:01:32 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-09-24 10:01:32 -0700 |
| commit | b57dd722f1dc0663417da37d3a82f8283ad3c982 (patch) | |
| tree | 49aec7f0e7b4bd68998dfcd78e83f9eb731f8ba1 /packages/services | |
| parent | aa31169804dffa3b36654ccffe67a53f6ff4cdaf (diff) | |
| parent | a884d81e8675505d86569e034e83ca267c12a6a8 (diff) | |
resolved conflicts for a884d81e to stage-aosp-master
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
Diffstat (limited to 'packages/services')
| -rw-r--r-- | packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp b/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp index 272733893280..990d7707cdfb 100644 --- a/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp +++ b/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp @@ -130,7 +130,7 @@ static jstring com_android_pacprocessor_PacNative_makeProxyRequestNativeLocked(J return jret; } -static JNINativeMethod gMethods[] = { +static const JNINativeMethod gMethods[] = { { "createV8ParserNativeLocked", "()Z", (void*)com_android_pacprocessor_PacNative_createV8ParserNativeLocked}, { "destroyV8ParserNativeLocked", "()Z", |