Merge mozilla-b2g34 to 2.1s. a=merge
commit3f158015493efb6b4ac5a885ee1c25607170b0d2
authorVincent Liu <vliu@mozilla.com>
Tue, 20 Jan 2015 06:32:59 +0000 (20 14:32 +0800)
committerVincent Liu <vliu@mozilla.com>
Tue, 20 Jan 2015 06:32:59 +0000 (20 14:32 +0800)
treeb4465f425804f653d1daada4591fba498a65125e
parentf8056569825f1b213c66c36d3c6f62dd729dcad6
parent97bb9b2256cd26f510dd05a7345cadb045045731
Merge mozilla-b2g34 to 2.1s. a=merge