Ryan VanderMeulen 01499c3bc0 Merge inbound to m-c. a=merge		2015-07-27 15:34:42 -04:00
..
android	Bug 1145503 - TP exceptions added while in Private Browsing mode persist beyond the Private Browsing session. r=ehsan	2015-07-26 13:23:12 +03:00
locales	Bug 958886 - Use HTTPS for amazon.com searches from the search box	2015-07-27 11:43:12 -04:00