Commit 8fe131fb authored by Brian Orr's avatar Brian Orr
Browse files

Merge PPR1.180503.001 

Conflicts:
	core/res/res/values-mcc405/config.xml

Change-Id: I45ebf5232cd10ed1f51ffaab718db6fa003a14b2
parents 0317c9f3 005473f5
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment