Merge mozilla-b2g34 to 2.1s. a=merge
commit14a0bd22330f280a929bae7a3fa7692ee4d666e8
authorVincent Liu <vliu@mozilla.com>
Tue, 31 Mar 2015 01:35:46 +0000 (31 09:35 +0800)
committerVincent Liu <vliu@mozilla.com>
Tue, 31 Mar 2015 01:35:46 +0000 (31 09:35 +0800)
tree670839b605388949cf5eebd385e00376d7b5f3f6
parentde22f9e9ce8c4e5047d310b5b79b40586c1734a5
parent9e69dfce2aa9dc451cbb09569900c3ab05b483a6
Merge mozilla-b2g34 to 2.1s. a=merge