Merge mozilla-b2g34 to 2.1s. a=merge
commit5f5a76e6d703040080a16bf383518ba86cde3252
authorVincent Liu <vliu@mozilla.com>
Fri, 12 Jun 2015 01:38:59 +0000 (12 09:38 +0800)
committerVincent Liu <vliu@mozilla.com>
Fri, 12 Jun 2015 01:38:59 +0000 (12 09:38 +0800)
tree8da20b6f0609a161138fb184cf551143f390bfac
parent3e3a9ec910f8af4812bf904a1846b90213ebff18
parentbfd3b51b042800fac5f9c8261c172c4b9fcdb77c
Merge mozilla-b2g34 to 2.1s. a=merge
b2g/config/emulator/sources.xml