Commits · 91b2ad6949ecc3e63869b0650444c4f3e8981709 · halo / packages_apps_DeskClock

16 Feb, 2012 6 commits
- am d2f3e67c: am 61fe9efb: Reconcile with ics-mr1-release · 91b2ad69
  The Android Open Source Project authored 13 years ago
```
* commit 'd2f3e67c':
```
  91b2ad69
- am fefac106: am 7196582b: Reconcile with ics-mr1-release · 5b53358a
  The Android Open Source Project authored 13 years ago
```
* commit 'fefac106':
```
  5b53358a
- am 61fe9efb: Reconcile with ics-mr1-release · d2f3e67c
  The Android Open Source Project authored 13 years ago
```
* commit '61fe9efb':
```
  d2f3e67c
- Reconcile with ics-mr1-release · 61fe9efb
  The Android Open Source Project authored 13 years ago
```
Change-Id: I3008799f033e5721247004ba10ee5d6f70b91318
```
  61fe9efb
- am 7196582b: Reconcile with ics-mr1-release · fefac106
  The Android Open Source Project authored 13 years ago
```
* commit '7196582b':
```
  fefac106
- Reconcile with ics-mr1-release · 7196582b
  The Android Open Source Project authored 13 years ago
```
Change-Id: Iab48fe998ee0d4add323a319afe32b82d7f07fb1
```
  7196582b
14 Feb, 2012 1 commit
- merge in ics-mr1-release history after reset to ics-mr1 · b84980b9
  The Android Automerger authored 13 years ago
  
  b84980b9
10 Feb, 2012 11 commits
- am a9a12d03: Import translations. · 373ffb3f
  Eric Fischer authored 13 years ago
```
* commit 'a9a12d03':
  Import translations.
```
  373ffb3f
- Import translations. · a9a12d03
  Eric Fischer authored 13 years ago
```
Change-Id: I179da97bc700e1309698d557e6519e7c0dda5bb7
```
  a9a12d03
- am 6709e620: am 015b49b2: Merge branch \'ics-scoop-plus-aosp\' of... · 38856c5b
  Eric Fischer authored 13 years ago
```
am 6709e620: am 015b49b2: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/packages/apps/DeskClock into ics-scoop-plus-aosp

* commit '6709e620':
```
  38856c5b
- am b03dac77: am 22fccd76: (-s ours) am caa845da: am 1b732993: Import translations. DO NOT MERGE · 07e1dd6f
  Eric Fischer authored 13 years ago
```
* commit 'b03dac77':
  Import translations. DO NOT MERGE
```
  07e1dd6f
- am 015b49b2: Merge branch \'ics-scoop-plus-aosp\' of... · 6709e620
  Eric Fischer authored 13 years ago
```
am 015b49b2: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/packages/apps/DeskClock into ics-scoop-plus-aosp

* commit '015b49b2':
```
  6709e620
- am 22fccd76: (-s ours) am caa845da: am 1b732993: Import translations. DO NOT MERGE · b03dac77
  Eric Fischer authored 13 years ago
```
* commit '22fccd76':
  Import translations. DO NOT MERGE
```
  b03dac77
- Merge branch 'ics-scoop-plus-aosp' of... · 015b49b2
  Eric Fischer authored 13 years ago
```
Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/packages/apps/DeskClock into ics-scoop-plus-aosp
```
  015b49b2
- am caa845da: am 1b732993: Import translations. DO NOT MERGE · 22fccd76
  Eric Fischer authored 13 years ago
```
* commit 'caa845da':
  Import translations. DO NOT MERGE
```
  22fccd76
- am f941459b: (-s ours) am 1b732993: Import translations. DO NOT MERGE · d50402cf
  Eric Fischer authored 13 years ago
```
* commit 'f941459b':
  Import translations. DO NOT MERGE
```
  d50402cf
- am 1b732993: Import translations. DO NOT MERGE · caa845da
  Eric Fischer authored 13 years ago
```
* commit '1b732993':
  Import translations. DO NOT MERGE
```
  caa845da
- am 1b732993: Import translations. DO NOT MERGE · f941459b
  Eric Fischer authored 13 years ago
```
* commit '1b732993':
  Import translations. DO NOT MERGE
```
  f941459b
09 Feb, 2012 3 commits
- am f33d0d0e: Import translations. DO NOT MERGE · 9c8c66b3
  Eric Fischer authored 13 years ago
```
* commit 'f33d0d0e':
  Import translations. DO NOT MERGE
```
  9c8c66b3
- Import translations. DO NOT MERGE · f33d0d0e
  Eric Fischer authored 13 years ago
```
Change-Id: Ia71b7363cdb04eb757c51001ab91002f7e9c63ec
```
  f33d0d0e
- Import translations. DO NOT MERGE · 1b732993
  Eric Fischer authored 13 years ago
```
Change-Id: I8feb96a6173b76182a4b953b442a61813130070a
```
  1b732993
01 Feb, 2012 4 commits
- am c0572686: am 92b23eb2: am ff48279f: Reconcile with ics-mr1-release · cf8b221c
  The Android Open Source Project authored 13 years ago
```
* commit 'c0572686':
```
  cf8b221c
- am 92b23eb2: am ff48279f: Reconcile with ics-mr1-release · c0572686
  The Android Open Source Project authored 13 years ago
```
* commit '92b23eb2':
```
  c0572686
- am ff48279f: Reconcile with ics-mr1-release · 92b23eb2
  The Android Open Source Project authored 13 years ago
```
* commit 'ff48279f':
```
  92b23eb2
- Reconcile with ics-mr1-release · ff48279f
  The Android Open Source Project authored 13 years ago
```
Change-Id: I168f00c077213170dfe00ecd68ac24023d16b5d1
```
  ff48279f
26 Jan, 2012 3 commits
- am a777881d: Import translations. DO NOT MERGE · c9cd6cf0
  Eric Fischer authored 13 years ago
```
* commit 'a777881d':
  Import translations. DO NOT MERGE
```
  c9cd6cf0
- Import translations. DO NOT MERGE · a777881d
  Eric Fischer authored 13 years ago
```
Change-Id: Ie887e85f53926d55c7be4a8049c82e9b86dd9234
```
  a777881d
- am dfc70920: Fix NPE when resuming. · 793ead51
  Daniel Sandler authored 13 years ago
```
* commit 'dfc70920':
  Fix NPE when resuming.
```
  793ead51
18 Jan, 2012 1 commit
- Fix NPE when resuming. · dfc70920
  Daniel Sandler authored 13 years ago
```
Bug: 5868975
Change-Id: Ib5b312338af8591a6ae506080fe23a82213ef538
```
  dfc70920
29 Dec, 2011 2 commits
- am aff2bd6b: Import revised translations. · 63b5f9ad
  Eric Fischer authored 13 years ago
```
* commit 'aff2bd6b':
  Import revised translations.
```
  63b5f9ad
- Import revised translations. · aff2bd6b
  Eric Fischer authored 13 years ago
```
Change-Id: I7933c9a7a1a6581c97eeae56c5d5a689e314bc00
```
  aff2bd6b
12 Dec, 2011 2 commits
- am 9e80924a: am 6e066ea4: Reconcile with ics-mr1-release · 5cf83f4f
  The Android Open Source Project authored 13 years ago
```
* commit '9e80924a':
```
  5cf83f4f
- am 6e066ea4: Reconcile with ics-mr1-release · 9e80924a
  The Android Open Source Project authored 13 years ago
```
* commit '6e066ea4':
```
  9e80924a
09 Dec, 2011 6 commits
- am 164f907e: am 2ea80499: (-s ours) am 9ecb98e6: Import revised translations. DO NOT MERGE · 32cdcdbd
  Eric Fischer authored 13 years ago
```
* commit '164f907e':
  Import revised translations. DO NOT MERGE
```
  32cdcdbd
- am 57585f04: am 52fb5e53: Reconcile with ics-mr1-release · 4ac2817f
  The Android Open Source Project authored 13 years ago
```
* commit '57585f04':
```
  4ac2817f
- am 2ea80499: (-s ours) am 9ecb98e6: Import revised translations. DO NOT MERGE · 164f907e
  Eric Fischer authored 13 years ago
```
* commit '2ea80499':
  Import revised translations. DO NOT MERGE
```
  164f907e
- am 52fb5e53: Reconcile with ics-mr1-release · 57585f04
  The Android Open Source Project authored 13 years ago
```
* commit '52fb5e53':
```
  57585f04
- Reconcile with ics-mr1-release · 6e066ea4
  The Android Open Source Project authored 13 years ago
```
Change-Id: I0d389bfa9180fd2a46d2f9aa58242b71e7eff177
```
  6e066ea4
- merge in ics-mr1-release history after reset to ics-mr1 · 4330fe56
  The Android Automerger authored 13 years ago
  
  4330fe56
08 Dec, 2011 1 commit
- am 9ecb98e6: Import revised translations. DO NOT MERGE · 2ea80499
  Eric Fischer authored 13 years ago
```
* commit '9ecb98e6':
  Import revised translations. DO NOT MERGE
```
  2ea80499