am 2fa017f8: Merge "fix datetime layout for phones and remove orientation locking" into ics-mr1

* commit '2fa017f874d20a5b037ebe57f3fc0c53964080bc':
  fix datetime layout for phones and remove orientation locking