Merge mozilla-b2g34 to 2.1s. a=merge
commitd1036a8d534ae30c1bce88608fe2713bc7c4f583
authorVincent Liu <vliu@mozilla.com>
Tue, 14 Apr 2015 01:43:32 +0000 (14 09:43 +0800)
committerVincent Liu <vliu@mozilla.com>
Tue, 14 Apr 2015 01:43:32 +0000 (14 09:43 +0800)
tree733c152c9ff5437431692af77761cbdf57cf83ec
parent9b053819ab5e5e3301704df9131e0a101d5a8f79
parent99f140ea179a85a2635488461e8e655f4dbac2fc
Merge mozilla-b2g34 to 2.1s. a=merge