Learn more about cloning repositories
You have read-only access
resolved conflicts for merge of 7d17de35 to master Conflicts: core/res/res/values/public.xml Change-Id: I14b4e332be7ef27e76a2773a504cb942bd0642ef
