Wes Kocher 2ed2b43c29 Merge m-c to inbound, a=merge ... --HG-- extra : commitid : KfjY9JJOq3w		2016-01-21 17:36:22 -08:00
..
android	Merge m-c to inbound, a=merge	2016-01-21 17:36:22 -08:00
locales	Bring Android's about:certerror and about:neterror closer to the desktop versions (bug 1238382). r=margaret	2016-01-21 09:19:02 +02:00