mozilla-b2g/gaia — pull request #10668 by ian-liu (2013-06-27 10:50:48+00:00)
Title: Bug 842750 - [B2G] [Clock] Default alarm name not localized r=timdream(cherry picked from commit 77db64fee5003b01fee9c1b0d149d124e9e20563)

Fixing confict and uplift to v1-train