commit 69727778a74baacb880dffbd1c6692457932bf57
author Steven Moreland <smoreland@google.com> Tue Oct 25 15:45:19 2016 -0700
committer Martijn Coenen <maco@google.com> Wed Oct 26 12:04:37 2016 +0200
tree a405157326d8fd32a064da21b60d31f6ad3d43db
parent 188ebec9948763f8287eeba84ff74b9a4aba3c4c

Stop all these merge conflicts.

Test: mma -j64
Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609

thermal/1.0/Android.bp

diff --git a/thermal/1.0/Android.bp b/thermal/1.0/Android.bp
index 0c5dd19..ae64dde 100644
--- a/thermal/1.0/Android.bp
+++ b/thermal/1.0/Android.bp
@@ -43,4 +43,9 @@
         "libutils",
         "libcutils",
     ],
+export_shared_lib_headers: [
+    "libhidl",
+    "libhwbinder",
+    "libutils",
+    ],
 }

thermal/Android.bp

diff --git a/thermal/Android.bp b/thermal/Android.bp
new file mode 100644
index 0000000..ba90f2c
--- /dev/null
+++ b/thermal/Android.bp
@@ -0,0 +1,5 @@
+// This is an autogenerated file, do not edit.
+subdirs = [
+    "1.0",
+    "1.0/default",
+]