commit 7a4f118c48e08fd3db62c82e3d56c1a8a300a171
author Steven Moreland <smoreland@google.com> Tue Oct 25 15:45:19 2016 -0700
committer Martijn Coenen <maco@google.com> Wed Oct 26 12:05:29 2016 +0200
tree b645eff302c62b27abe27389050ce1e1bd4d7f2f
parent 54813ed7c631ee5bfa499e87da65cacbf10efc9b

Stop all these merge conflicts.

Test: mma -j64
Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
new file mode 100644
index 0000000..e9b0148
--- /dev/null
+++ b/tests/Android.bp
@@ -0,0 +1,16 @@
+// This is an autogenerated file, do not edit.
+subdirs = [
+    "bar/1.0",
+    "bar/1.0/default",
+    "baz/1.0",
+    "expression/1.0",
+    "foo/1.0",
+    "foo/1.0/default",
+    "foo/1.0/default/lib",
+    "libhwbinder/1.0",
+    "libhwbinder/1.0/default",
+    "msgq/1.0",
+    "pointer/1.0",
+    "pointer/1.0/default",
+    "pointer/1.0/default/lib",
+]