Merge mozilla-b2g34 to 2.1s. a=merge
commit78ef651938f83c102c2f0a7c7d23c89c593ab940
authorVincent Liu <vliu@mozilla.com>
Thu, 9 Apr 2015 03:00:21 +0000 (9 11:00 +0800)
committerVincent Liu <vliu@mozilla.com>
Thu, 9 Apr 2015 03:00:21 +0000 (9 11:00 +0800)
treed7b82af179d17a8ce7d68555e4ac62f505a998f7
parentcad442e4d565962e89ba87ee91d6ecd5ede0578a
parentb854ba97d7df78f285f00fc8a6c78f51aba9d351
Merge mozilla-b2g34 to 2.1s. a=merge