Learn more about cloning repositories
You have read-only access
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386 Change-Id: Iadf90edb02bacf645896f7d074d011a2aca4b251