merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Fixed up launcher icon

Previous version was 143x144. This makes it square.

Bug: 6718166
Bug: 7347547
Change-Id: Ieef1bfa73a5c4346edbc1f09a090d9814327af80
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I05898213acd27876be3c0f8f8375e16b3396b420
am bdfaec3f: Fix widget layouts

* commit 'bdfaec3fba75927f10471e7a1f2b15a73ad801dc':
  Fix widget layouts
am 672e6740: clock preview no more bold

* commit '672e67403656e7d577743ccd4f24229dcccf1fde':
  clock preview no more bold
Reconcile with jb-mr1-release - do not merge

Change-Id: I1f52d5d7aa89887d2d5f808e27f8ae6cc5fbf765
am f84ef35b: Add am/pm support and bold hours to widget

* commit 'f84ef35bea04fbb6898ea4ec18e27b8a7d6875fc':
  Add am/pm support and bold hours to widget
am e1078a13: Merge "Revert "clock preview no more bold" since we switched back to bold hours." into jb-mr1-dev

* commit 'e1078a13b2489c3054fb65ed0f8ce377b8a53810':
  Revert "clock preview no more bold" since we switched back to bold hours.
am 7c398368: Merge "Update world clocks with time zone" into jb-mr1-dev

* commit '7c3983680d1cdb8c810bab3f336b32d3cb36e66f':
  Update world clocks with time zone
am a7efbc4c: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'a7efbc4c49c4dd432814e16f6bb745cfe2d7c4dd':
  Import translations. DO NOT MERGE
am 40942965: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '409429653d9c3675c2bee1ffcd8394a810f273a7':
  Import translations. DO NOT MERGE
am 096a799c: (-s ours) am 0ced4040: (-s ours) Import translations. DO NOT MERGE

* commit '096a799c63fd58392ae34f71742d2aed8e99b638':
am e7d2f4e4: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit 'e7d2f4e4798c6b98d1ff1bcee0e18418c723c375':
  Import translations. DO NOT MERGE
am 41463e5e: am e85aa294: Fixed response to taps in alarm "card"

* commit '41463e5e833d37af76bd1e0519cc5e06df182951':
am 7af654f5: am f77f3f72: Center world clocks

* commit '7af654f5851eacce9d62b00a296b3a35b86a3801':