diff options
| author | Steven Moreland <smoreland@google.com> | 2016-10-25 15:45:19 -0700 |
|---|---|---|
| committer | Martijn Coenen <maco@google.com> | 2016-10-26 12:04:37 +0200 |
| commit | 69727778a74baacb880dffbd1c6692457932bf57 (patch) | |
| tree | a405157326d8fd32a064da21b60d31f6ad3d43db /vr/Android.bp | |
| parent | 188ebec9948763f8287eeba84ff74b9a4aba3c4c (diff) | |
| download | android_hardware_interfaces-69727778a74baacb880dffbd1c6692457932bf57.tar.gz android_hardware_interfaces-69727778a74baacb880dffbd1c6692457932bf57.tar.bz2 android_hardware_interfaces-69727778a74baacb880dffbd1c6692457932bf57.zip | |
Stop all these merge conflicts.
Test: mma -j64
Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609
Diffstat (limited to 'vr/Android.bp')
| -rw-r--r-- | vr/Android.bp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vr/Android.bp b/vr/Android.bp new file mode 100644 index 000000000..ba90f2c9d --- /dev/null +++ b/vr/Android.bp @@ -0,0 +1,5 @@ +// This is an autogenerated file, do not edit. +subdirs = [ + "1.0", + "1.0/default", +] |