Merge mozilla-b2g34 to 2.1s. a=merge
commite8f9cdd05d2bea4546c3121b007769ea04a486a4
authorKai-Zhen Li <kli@mozilla.com>
Tue, 28 Apr 2015 02:22:44 +0000 (28 10:22 +0800)
committerKai-Zhen Li <kli@mozilla.com>
Tue, 28 Apr 2015 02:22:44 +0000 (28 10:22 +0800)
tree3f9e3980e0d658a218864c84cb48155efd149abf
parentd85855e3984d4fb2f40cc508dbea1d9553167aec
parentbaed829723013d9c5e85bf1a941bd3d8c895024f
Merge mozilla-b2g34 to 2.1s. a=merge