sg3/android_vendor_cm — comment on commit f00e31526cfb7e26be01370ff34bd03bc3bfcc38
File:  line 0
By Arakmar:

Yes It was for merging conflicts. I'm really not good at choosing commit messages :D