Merge mozilla-b2g34 to 2.1s. a=merge
commit1b096fd8a6e1294f6ad67465d780c762f9d1a1cc
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 5 Jun 2015 02:37:46 +0000 (4 22:37 -0400)
committerRyan VanderMeulen <ryanvm@gmail.com>
Fri, 5 Jun 2015 02:37:46 +0000 (4 22:37 -0400)
treeff69283435cccf82f4240fae29dfec8bfc14a017
parent8860460a312168bf9419e272fa2631cac55b6ad3
parentb9f91ee765655b9ad3733454c63b5ba634881616
Merge mozilla-b2g34 to 2.1s. a=merge