Merge mozilla-b2g34 to 2.1s. a=merge
commit47579ad663e9eb5a2559ec244c30b3d16f94a103
authorVincent Liu <vliu@mozilla.com>
Wed, 20 May 2015 01:57:10 +0000 (20 09:57 +0800)
committerVincent Liu <vliu@mozilla.com>
Wed, 20 May 2015 01:57:10 +0000 (20 09:57 +0800)
tree060ff4dc2013467af25c03cb49a333ceee8127ae
parent167bff1459b3f95d43ff4544be63782814409ef9
parent213b2b9405381ce1620472fee73224eba334619b
Merge mozilla-b2g34 to 2.1s. a=merge
b2g/config/flame-kk/sources.xml
security/manager/boot/src/nsSTSPreloadList.errors
security/manager/boot/src/nsSTSPreloadList.inc