| commit | 69727778a74baacb880dffbd1c6692457932bf57 | [log] [tgz] |
|---|---|---|
| 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 [diff] [blame] |
Stop all these merge conflicts. Test: mma -j64 Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609
diff --git a/boot/Android.bp b/boot/Android.bp new file mode 100644 index 0000000..bbb3e4b --- /dev/null +++ b/boot/Android.bp
@@ -0,0 +1,4 @@ +// This is an autogenerated file, do not edit. +subdirs = [ + "1.0", +]