Merge mozilla-b2g34 to 2.1s. a=merge
commitb3d791d8ad023171a5ca94187bb90c307378632f
authorVincent Liu <vliu@mozilla.com>
Thu, 23 Apr 2015 01:28:29 +0000 (23 09:28 +0800)
committerVincent Liu <vliu@mozilla.com>
Thu, 23 Apr 2015 01:28:29 +0000 (23 09:28 +0800)
tree40bde91bfa1d0d589d5306208a5834624d2f370e
parentc2f9375a2e068f9a54d345bc83eb8f428bd49707
parent0402001b441c8145f3f01b304a5c4b9ca8d71d7e
Merge mozilla-b2g34 to 2.1s. a=merge