am c1b62e3b: am bf5adfa5: Merge "Check if we are in daylight time when calculating...

* commit 'c1b62e3ba91d69dd75569b480aec55be8f808331':
  Check if we are in daylight time when calculating timezone

diff --cc services/java/com/android/server/AlarmManagerService.java
Simple merge