* commit '9fc5c5c9':
  Revert "Fix alarm expanding issues." This is causing a null pointer crash.
  Fix alarm db upgrade.
  Fix crash in async deletion task and remove some dead code
  Hide keyboard in alarm alert
  Use child fragment manager to prevent FragmentManager crash
  Create the alarm after setting the time.
  Fix crash and excessive alarm creation from quick settings access.
  Enable new time picker for setting alarms.
  Import translations. DO NOT MERGE
  Fix ArrayIndexOutOfBoundsException on zero-length array
  Adding new png files.
  Fix bug where we weren't firing the correct alarm