Merge mozilla-beta to b2g37. a=merge
commitbce127fad8da5ac17d035fe8c67161cd107044c0
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 2 Mar 2015 20:17:01 +0000 (2 15:17 -0500)
committerRyan VanderMeulen <ryanvm@gmail.com>
Mon, 2 Mar 2015 20:17:01 +0000 (2 15:17 -0500)
treeddcd4bb2f5f5e7e0c6de0be158c91d4039f0a13e
parenta78387634bb66421043f0e05f7495f078b3ded4c
parent56901abfd4b2232c911ff15f0e8d231817f89f31
Merge mozilla-beta to b2g37. a=merge
dom/media/mediasource/ContainerParser.cpp
netwerk/protocol/http/nsHttpTransaction.cpp
netwerk/protocol/http/nsHttpTransaction.h
widget/nsBaseWidget.cpp