resolve merge conflicts of cb5474b14 to oc-dev-plus-aosp

Change-Id: I8392be7b6aac1ebe26cf064e3b7ad93c6aeb6daf
2017-04-07 13:24:00 -07:00 · 2017-04-07 13:24:00 -07:00 · 56d6e891be
parent 755cdc6173 cb5474b140
commit 56d6e891be
10 changed files with 5 additions and 0 deletions
--- a/include/system
+++ b/include/system
@ -0,0 +1 @@
+../libsystem/include/system/
--- a/libsystem/Android.bp
+++ b/libsystem/Android.bp
@ -0,0 +1,4 @@
+cc_library_headers {
+    name: "libsystem_headers",
+    export_include_dirs: ["include"],
+}
--- a/libsystem/include/system/camera.h
+++ b/libsystem/include/system/camera.h
--- a/libsystem/include/system/graphics-base.h
+++ b/libsystem/include/system/graphics-base.h
--- a/libsystem/include/system/graphics.h
+++ b/libsystem/include/system/graphics.h
--- a/libsystem/include/system/qemu_pipe.h
+++ b/libsystem/include/system/qemu_pipe.h
--- a/libsystem/include/system/radio.h
+++ b/libsystem/include/system/radio.h
--- a/libsystem/include/system/thread_defs.h
+++ b/libsystem/include/system/thread_defs.h
--- a/libsystem/include/system/window-deprecated.h
+++ b/libsystem/include/system/window-deprecated.h
--- a/libsystem/include/system/window.h
+++ b/libsystem/include/system/window.h