commit 1a1d086a78d657e0e951e72d447e9b7abf32058f
author Xin Li <delphij@google.com> Wed Nov 15 02:35:43 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 15 02:35:43 2017 +0000
tree 1ad6cb9e08c44aef1ef9b644fe4fd561f57adfd2
parent 87199ac524d9b02ab084eda5ad7140773b734cde
parent 241b591a402f41458dc9cda70725acc2b576d7e0

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 241b591a40

Change-Id: I6da61679eeff985c8d063f21b7ec31cae5aa9569

include_deprecated/JNIHelp.h

diff --git a/include_deprecated/JNIHelp.h b/include_deprecated/JNIHelp.h
deleted file mode 120000
index d4cf162..0000000
--- a/include_deprecated/JNIHelp.h
+++ /dev/null
@@ -1 +0,0 @@
-../include/nativehelper/JNIHelp.h
\ No newline at end of file

include_deprecated/UniquePtr.h

diff --git a/include_deprecated/UniquePtr.h b/include_deprecated/UniquePtr.h
deleted file mode 120000
index e47c2a2..0000000
--- a/include_deprecated/UniquePtr.h
+++ /dev/null
@@ -1 +0,0 @@
-../include/nativehelper/UniquePtr.h
\ No newline at end of file

include_deprecated/jni.h

diff --git a/include_deprecated/jni.h b/include_deprecated/jni.h
deleted file mode 120000
index 0f70e26..0000000
--- a/include_deprecated/jni.h
+++ /dev/null
@@ -1 +0,0 @@
-../include_jni/jni.h
\ No newline at end of file