Merge branch 'LA.BR.1.2.9_rb1.7' of git://codeaurora.org/platform/packages/apps/DeskClock into HEAD