Merge mozilla-b2g34 to 2.1s. a=merge
commit652ccb369595ea85c541c3861444f4baf8697505
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 25 May 2015 15:32:07 +0000 (25 11:32 -0400)
committerRyan VanderMeulen <ryanvm@gmail.com>
Mon, 25 May 2015 15:32:07 +0000 (25 11:32 -0400)
tree16d06a3ea076f8f228c0ea9b662800d58e56d50e
parent3cc33f799aca4dc4a6b44c7783dd31e61fe474aa
parent993606734ca4ac51b5e5787559d9e1f2355212fd
Merge mozilla-b2g34 to 2.1s. a=merge