Merge mozilla-beta to b2g37. a=merge
commit8906ac42d7b0567bb28dba8536e16674aafd099a
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 9 Mar 2015 02:00:26 +0000 (8 22:00 -0400)
committerRyan VanderMeulen <ryanvm@gmail.com>
Mon, 9 Mar 2015 02:00:26 +0000 (8 22:00 -0400)
tree1ada2480c9b56844e4fa6cbabc7773250cd50ef4
parente5f51a35c847003ed6813b9eadac1753eb0b98ef
parentdaf55fcbae2a03f25e0ae769518bf7278c1c293b
Merge mozilla-beta to b2g37. a=merge
dom/media/omx/MediaOmxReader.cpp
dom/media/test/mochitest.ini
layout/reftests/bugs/reftest.list