summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | am 2ec1aa5d: am 69e51c11: am af116754: am 8e217dcc: Merge "Cancel times up no...Annie Chin2015-07-211-0/+4
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | am 69e51c11: am af116754: am 8e217dcc: Merge "Cancel times up notification on...Annie Chin2015-07-201-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | am dbd555ad: am a8245f8d: am aa00e775: am 62ff2ac2: Cherry-pick ag/725002Annie Chin2015-07-214-3/+21
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | am a8245f8d: am aa00e775: am 62ff2ac2: Cherry-pick ag/725002Annie Chin2015-07-204-3/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | am 1fd1b942: (-s ours) am 393f0ef2: (-s ours) am 09de6476: (-s ours) am 59aec...Geoff Mendal2015-07-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am 393f0ef2: (-s ours) am 09de6476: (-s ours) am 59aec9e2: (-s ours) am 17202...Geoff Mendal2015-07-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | am e2660b54: (-s ours) am 48ff2468: (-s ours) am fb4a5289: (-s ours) am 6765d...Geoff Mendal2015-07-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | am 48ff2468: (-s ours) am fb4a5289: (-s ours) am 6765d85e: (-s ours) Import t...Geoff Mendal2015-07-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | am 2b652384: (-s ours) am 528121e8: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | am 528121e8: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | am dc1e7879: am 807ff4dc: am 35c25a48: am 80ebff21: Update stopwatch circle o...Annie Chin2015-07-171-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | am 807ff4dc: am 35c25a48: am 80ebff21: Update stopwatch circle on RESET_AND_L...Annie Chin2015-07-171-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 55333b51: am 1f2377e5: am 71129591: am 9da3a43b: Fix logging call to corre...James Lemieux2015-07-171-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | am 1f2377e5: am 71129591: am 9da3a43b: Fix logging call to correctly substituteJames Lemieux2015-07-171-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 0c625792: am 4f81ec54: am 78e3b09b: am f283eae0: Merge "Avoid NPE when Scr...James Lemieux2015-07-161-4/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | am 4f81ec54: am 78e3b09b: am f283eae0: Merge "Avoid NPE when Screensaver conf...James Lemieux2015-07-161-4/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 91059a68: am 4929e5db: am 0c289cd4: am 6b7d6b9b: Canceling PendingIntentDaria Evdokimova2015-07-161-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am 4929e5db: am 0c289cd4: am 6b7d6b9b: Canceling PendingIntentDaria Evdokimova2015-07-161-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 12f48d5f: (-s ours) am 496b6836: (-s ours) am 81c18d56: (-s ours) am 56028...Geoff Mendal2015-07-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 496b6836: (-s ours) am 81c18d56: (-s ours) am 5602815a: (-s ours) Import t...Geoff Mendal2015-07-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 755e7ce3: (-s ours) am d5a0a3cb: (-s ours) am 0e35d295: (-s ours) am 16aa5...Geoff Mendal2015-07-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d5a0a3cb: (-s ours) am 0e35d295: (-s ours) am 16aa5af8: (-s ours) Import t...Geoff Mendal2015-07-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 962fb37a: (-s ours) am d5cbb369: (-s ours) am acb55a22: (-s ours) am b2ea7...Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d5cbb369: (-s ours) am acb55a22: (-s ours) am b2ea7132: (-s ours) am 66f75...Geoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 048150f0: (-s ours) am 26cbee7a: (-s ours) am 9f0b7c57: (-s ours) am 61a8c...Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 26cbee7a: (-s ours) am 9f0b7c57: (-s ours) am 61a8cfe5: (-s ours) Revert "...Geoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 840f01ac: (-s ours) am fbae4a8c: (-s ours) am 3e395812: (-s ours) am c20c6...Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am fbae4a8c: (-s ours) am 3e395812: (-s ours) am c20c6b32: (-s ours) Import t...Geoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 62e0fe6f: (-s ours) am 470a52d6: (-s ours) am 269d5e3b: (-s ours) Import t...Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 470a52d6: (-s ours) am 269d5e3b: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0e0e62cc: (-s ours) am fcd4f07b: (-s ours) am 1f8327ba: (-s ours) am 449b3...Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am fcd4f07b: (-s ours) am 1f8327ba: (-s ours) am 449b30ab: (-s ours) am 0539c...Geoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0235ab87: (-s ours) am d946056d: (-s ours) am 41d4f5fc: (-s ours) am 12627...Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d946056d: (-s ours) am 41d4f5fc: (-s ours) am 12627349: (-s ours) Import t...Geoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 39dfc547: (-s ours) am 60f2ee6d: (-s ours) am f92ab6f4: (-s ours) Import t...Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 60f2ee6d: (-s ours) am f92ab6f4: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 82ca25dc: (-s ours) am 379fb13e: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 379fb13e: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am cceb18b1: am fe79385b: am 1d5af291: am 9c20370b: am 2e2d8b37: Kick the build.Annie Chin2015-07-141-2/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am fe79385b: am 1d5af291: am 9c20370b: am 2e2d8b37: Kick the build.Annie Chin2015-07-141-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 85dd6c9b: am 6973151d: am 7c2129c5: am 0458c052: Fixing bug for firing tim...Daria Evdokimova2015-07-141-8/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 6973151d: am 7c2129c5: am 0458c052: Fixing bug for firing timer after STOP...Daria Evdokimova2015-07-141-8/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 213cb2aa: am 6e494b5a: am 3b7ba597: am 4ed569b3: Fixing bug for RESET_TIME...Daria Evdokimova2015-07-141-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 6e494b5a: am 3b7ba597: am 4ed569b3: Fixing bug for RESET_TIMER and STOP_TIMERDaria Evdokimova2015-07-141-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am cb01cdd3: am f41cb571: am dc3e827d: am 8d915492: Merge "Fixing bug for STO...Daria Evdokimova2015-07-141-1/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am f41cb571: am dc3e827d: am 8d915492: Merge "Fixing bug for STOP_TIMER" into...Daria Evdokimova2015-07-141-1/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am e65b1aef: am 01df782a: am 2bce5a9d: am 03b26537: Add fix in case strings h...Annie Chin2015-07-141-2/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 01df782a: am 2bce5a9d: am 03b26537: Add fix in case strings have not yet b...Annie Chin2015-07-131-2/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 54238386: am 0b0dbbb9: am ba026c6e: am e8fad03b: Fixing bug for ADD_CLOCK ...Daria Evdokimova2015-07-141-2/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0b0dbbb9: am ba026c6e: am e8fad03b: Fixing bug for ADD_CLOCK & DELETE_CLOCKDaria Evdokimova2015-07-131-2/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \