Phil Ringnalda e67329a593 Merge m-i to m-c, a=merge		2016-02-13 19:18:53 -08:00
..
android	Merge m-i to m-c, a=merge	2016-02-13 19:18:53 -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