Merge mozilla-beta to b2g37. a=merge
commitdd1986761f613b049fa33ec370830424caea2dc9
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 25 Mar 2015 22:27:16 +0000 (25 18:27 -0400)
committerRyan VanderMeulen <ryanvm@gmail.com>
Wed, 25 Mar 2015 22:27:16 +0000 (25 18:27 -0400)
tree2cc7603ee245e115bedb77730ef9350df147b782
parentb404ddd3da30a863810d1abc1f5ceefb5cbed2b6
parent48469e65f0bf484b2a7e65731ca6df9b43d82675
Merge mozilla-beta to b2g37. a=merge