Merge "Merge "Revert "aapt2_jni: use proper nativehelper headers"" into stage-aosp-master am: e59c1b1b50 am: bc6d35e698 am: 8e22616fb8" into oc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2017-08-12 03:48:38 +00:00
committed by Android (Google) Code Review

View File

@@ -22,7 +22,7 @@
#include <vector>
#include "android-base/logging.h"
#include "nativehelper/ScopedUtfChars.h"
#include "ScopedUtfChars.h"
#include "Diagnostics.h"
#include "util/Util.h"