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