Phil Ringnalda 2be4cee4d3 Merge f-t to m-c, a=merge		2016-05-14 13:04:50 -07:00
..
android	Merge f-t to m-c, a=merge	2016-05-14 13:04:50 -07:00
locales	merge mozilla-inbound to mozilla-central a=merge	2016-04-25 11:55:12 +02:00