Wes Kocher 419e80ad06 Merge m-c to inbound, a=merge		2016-05-06 15:58:32 -07:00
..
android	Merge m-c to inbound, a=merge	2016-05-06 15:58:32 -07:00
locales	merge mozilla-inbound to mozilla-central a=merge	2016-04-25 11:55:12 +02:00