Merge mozilla-b2g34 to 2.1s. a=merge
commit2bdbd0210ef36386b6951448df21035a289ae683
authorVincent Liu <vliu@mozilla.com>
Mon, 20 Apr 2015 01:37:38 +0000 (20 09:37 +0800)
committerVincent Liu <vliu@mozilla.com>
Mon, 20 Apr 2015 01:37:38 +0000 (20 09:37 +0800)
tree5924cda48a57579a85f21c03f0d747255d65c050
parent12bb722d507cca6471c9d1a31dfe243e5d25d172
parent088438ff2b8e69fcae4fdad4e024ade941197148
Merge mozilla-b2g34 to 2.1s. a=merge