Learn more about cloning repositories
You have read-only access
resolved conflicts for merge of 1c96a941 to mnc-ub-dev Change-Id: I37613fa8fc8ff0d91c8cc2f8c389326c30a6b297
