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