Merge mozilla-b2g37 to 2.2r. a=merge
commit0f128d9842436f14b3514a97de18aafd45266a87
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 30 Jul 2015 19:51:03 +0000 (30 15:51 -0400)
committerRyan VanderMeulen <ryanvm@gmail.com>
Thu, 30 Jul 2015 19:51:03 +0000 (30 15:51 -0400)
treec32923001d4b1a1fd90b35862e7a42e444c801ee
parent5e55166e2575cfbd61fee2eb8ad29abc3958d5a8
parenta08e611a6f83dce148305b96ef3271d3d3141d77
Merge mozilla-b2g37 to 2.2r. a=merge