platform_hardware_interfaces/sensors/Android.bp

// This is an autogenerated file, do not edit.
subdirs = [
    "1.0",
    "1.0/default",
    "1.0/vts/functional"
]
Stop all these merge conflicts. Test: mma -j64 Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609 2016-10-26 00:45:19 +02:00			`// This is an autogenerated file, do not edit.`
			`subdirs = [`
			`"1.0",`
			`"1.0/default",`
Revert "Update makefiles for Java package path." This reverts commit ab0792ccdc52958b9bd524e7025d5e38ea0bb0d6. Change-Id: I47fc272d9fa8875e3d7ccb10cb748c738fbf8135 2016-12-13 23:18:34 +01:00			`"1.0/vts/functional"`
Stop all these merge conflicts. Test: mma -j64 Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609 2016-10-26 00:45:19 +02:00			`]`