HI
i need help to fix CONFLICTS
3 conflicts in boot.img.out
15 conflicts in services.jar.out
18 conflicts in 7 files, go through the reject files in 'autopatch/reject' to find them out
- #
- # ADDITIONAL_DEFAULT_PROPERTIES
- #
- ro.adb.secure=1
- ro.secure=1
- security.perf_harden=1
- ro.allow.mock.location=0
- ro.debuggable=1
- ro.zygote=zygote32
- dalvik.vm.image-dex2oat-Xms=64m
- dalvik.vm.image-dex2oat-Xmx=64m
- dalvik.vm.dex2oat-Xms=64m
- dalvik.vm.dex2oat-Xmx=512m
- ro.dalvik.vm.native.bridge=0
- debug.atrace.tags.enableflags=0
- #
- # BOOTIMAGE_BUILD_PROPERTIES
- #
- <<<<<<< VENDOR #Conflict 0
- ro.bootimage.build.date=Tue Sep 27 10:41:43 JST 2016
- ro.bootimage.build.date.utc=1474940503
- ro.bootimage.build.fingerprint=samsung/cm_ks01ltexx/ks01ltexx:6.0.1/MOB30Z/aaff3b3ab7:userdebug/test-keys
- persist.sys.usb.config=mtp,adb
- =======
- ro.bootimage.build.date=2017年 05月 11日 星期四 10:26:30 CST
- ro.bootimage.build.date.utc=1494469590
- ro.bootimage.build.fingerprint=google/cm_angler/angler:6.0.1/MOB31K/26e68903ed:userdebug/test-keys
- persist.sys.usb.config=mtp,adb
- >>>>>>> BOSP #Conflict 0
1