Merge mozilla-b2g37 to 2.2r. a=merge
commit67e180386f28d26dd6db2a392f2307b85ffa81ca
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 4 Aug 2015 00:48:25 +0000 (3 20:48 -0400)
committerRyan VanderMeulen <ryanvm@gmail.com>
Tue, 4 Aug 2015 00:48:25 +0000 (3 20:48 -0400)
tree8b1a5b668dcce6efa3932fdd8fa096a44b2959bc
parent6d3a30bc2762c256ee7e509416e4d53bb7f57b87
parent8d9bbc312972ebc5a4576333c83d94de6afc1def
Merge mozilla-b2g37 to 2.2r. a=merge