am 37383dbe: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '37383dbe351f357082656ebaad9ad442328ce462':
  Import translations. DO NOT MERGE
am 71aa6a65: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '71aa6a651f53d7e3eba8756b85bbc160e95165a5':
  Import translations. DO NOT MERGE
am b3eb8470: am 71aa6a65: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'b3eb847099fa4ead002a7bb231ecdce0c80aa6f2':
  Import translations. DO NOT MERGE
am 2f5b2786: (-s ours) am 37383dbe: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '2f5b2786e213f6312a0cce7e8713ecdf7f19a6be':
  Import translations. DO NOT MERGE
am 5ff8ad54: (-s ours) am b3eb8470: am 71aa6a65: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '5ff8ad54732d362aa87e87d3533506d13dd47dbd':
  Import translations. DO NOT MERGE
am 22ad7c9e: Visual distinction for the five timer states

* commit '22ad7c9ea127b06ee0dc0cb809b59bab33afbf42':
  Visual distinction for the five timer states
am 8f97a722: Fix up the headers in Clock

* commit '8f97a722692863ae258d2381b2244208fba64823':
  Fix up the headers in Clock
am 9cffed5e: am 22ad7c9e: Visual distinction for the five timer states

* commit '9cffed5e99410eec49f9a2236067aa11f2bd4301':
  Visual distinction for the five timer states
am 3476a268: am 8f97a722: Fix up the headers in Clock

* commit '3476a268a27067294fddccd15e27e03a16bc55e5':
  Fix up the headers in Clock
am f02e4dcc: am 9cffed5e: am 22ad7c9e: Visual distinction for the five timer states

* commit 'f02e4dcc16cd43a364670526258ecb11633a10e4':
  Visual distinction for the five timer states
am 24c0adaf: am 3476a268: am 8f97a722: Fix up the headers in Clock

* commit '24c0adafc0cc34551a0b3fb721d0490936fd5d82':
  Fix up the headers in Clock
am 360468b9: Allow power button to dismiss/snooze.

* commit '360468b9110ceba95099404265b8ee6e582391d9':
  Allow power button to dismiss/snooze.
am ef618467: am 360468b9: Allow power button to dismiss/snooze.

* commit 'ef618467ec3e89bcefdac6f26fb8b814cb791370':
  Allow power button to dismiss/snooze.
am 9e403444: am ef618467: am 360468b9: Allow power button to dismiss/snooze.

* commit '9e40344483f745048b0dfb252253c34933a06db5':
  Allow power button to dismiss/snooze.
am aa3c3099: Pick sounds of TYPE_ALARM, not TYPE_RINGTONE.

* commit 'aa3c30991070ed78289964bba6af72a25341cb39':
  Pick sounds of TYPE_ALARM, not TYPE_RINGTONE.
am 70817db0: am aa3c3099: Pick sounds of TYPE_ALARM, not TYPE_RINGTONE.

* commit '70817db02a55a7c14edc4ce21d074024caf5e049':
  Pick sounds of TYPE_ALARM, not TYPE_RINGTONE.
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
am d331db46: am 70817db0: am aa3c3099: Pick sounds of TYPE_ALARM, not TYPE_RINGTONE.

* commit 'd331db46e0f4abcb2919d0c4f48092368de92d6d':
  Pick sounds of TYPE_ALARM, not TYPE_RINGTONE.
Merge "Import translations. DO NOT MERGE"
am 197b4888: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '197b4888f8b0c3cfee19ee4f3696835057e2e75f':
  Import translations. DO NOT MERGE