From 5410568e8c91c52fc75d72fe4d3db11712fc4c26 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Wed, 26 Jul 2017 12:21:58 -0700
Subject: [PATCH] ActivityManagerService: fix nativehelper includes

Bug: 63762847
Test: none

Merged-In: I9f9497990fbf0697d05445f563ad46a28d6d6eeb
Change-Id: I964c88cb74f0287dfc6634fbfcd3210a7d984213
---
 .../core/jni/com_android_server_am_ActivityManagerService.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core/jni/com_android_server_am_ActivityManagerService.cpp b/services/core/jni/com_android_server_am_ActivityManagerService.cpp
index 50e4502a9a3a2..14abaad025be0 100644
--- a/services/core/jni/com_android_server_am_ActivityManagerService.cpp
+++ b/services/core/jni/com_android_server_am_ActivityManagerService.cpp
@@ -20,8 +20,8 @@
 #include <android_runtime/AndroidRuntime.h>
 #include <jni.h>
 
-#include <ScopedLocalRef.h>
-#include <ScopedPrimitiveArray.h>
+#include <nativehelper/ScopedLocalRef.h>
+#include <nativehelper/ScopedPrimitiveArray.h>
 
 #include <cutils/log.h>
 #include <utils/misc.h>