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

No offense, but your "fix conflict" commits are always merges :D