summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am c9d7506c: (-s ours) Import translations. DO NOT MERGEandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r2android-6.0.0_r1marshmallow-releasemarshmallow-cts-releaseGeoff Mendal2015-08-010-0/+0
|\
| * Import translations. DO NOT MERGEGeoff Mendal2015-07-313-5/+5
* | Merge "Change MNC codename to just M." into mnc-devDianne Hackborn2015-07-312-4/+4
|\ \
| * | Change MNC codename to just M.Dianne Hackborn2015-07-292-4/+4
* | | am 5407d5c3: Resolve default alarm ringtone URI when computing their titleJames Lemieux2015-07-301-0/+8
|\ \ \ | | |/ | |/|
| * | Resolve default alarm ringtone URI when computing their titleJames Lemieux2015-07-301-0/+8
* | | am 32e2e044: Execute cleanup code in a new app instance after a restoreJames Lemieux2015-07-302-27/+115
|\| | | |/ |/|
| * Execute cleanup code in a new app instance after a restoreJames Lemieux2015-07-302-27/+115
* | am 0e42eb54: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-290-0/+0
|\|
| * Import translations. DO NOT MERGEGeoff Mendal2015-07-293-23/+23
* | am 21fa0866: (-s ours) Merge "Allow authority to be set from build configurat...Justin Klaassen2015-07-290-0/+0
|\|
| * Merge "Allow authority to be set from build configuration - DO NOT MERGE" int...Justin Klaassen2015-07-293-2/+25
| |\
| | * Allow authority to be set from build configuration - DO NOT MERGEJustin Klaassen2015-07-283-2/+25
* | | am 1f53186f: Recreate all AlarmInstances on restoreJames Lemieux2015-07-291-1/+26
|\| |
| * | Recreate all AlarmInstances on restoreJames Lemieux2015-07-281-1/+26
| |/
* | am ecd49f48: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-250-0/+0
|\|
| * Import translations. DO NOT MERGEGeoff Mendal2015-07-241-1/+1
* | am 76846b72: Support voice category on all public intentsJames Lemieux2015-07-211-3/+21
|\|
| * Support voice category on all public intentsJames Lemieux2015-07-201-3/+21
* | am 8e217dcc: Merge "Cancel times up notification on RESET, DELETE, or DONE." ...Annie Chin2015-07-201-0/+4
|\|
| * Merge "Cancel times up notification on RESET, DELETE, or DONE." into ub-deskc...Annie Chin2015-07-201-0/+4
| |\
| | * Cancel times up notification on RESET, DELETE, or DONE.Annie Chin2015-07-201-0/+4
* | | am 62ff2ac2: Cherry-pick ag/725002Annie Chin2015-07-204-3/+21
|\| |
| * | Cherry-pick ag/725002Annie Chin2015-07-204-3/+21
| |/
* | am 59aec9e2: (-s ours) am 17202440: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
|\|
| * am 17202440: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
| |\
| | * Import translations. DO NOT MERGEGeoff Mendal2015-07-2077-2464/+2656
* | | am 6765d85e: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
|\| |
| * | Import translations. DO NOT MERGEGeoff Mendal2015-07-2041-4873/+4873
* | | am 80ebff21: Update stopwatch circle on RESET_AND_LAUNCH intent.Annie Chin2015-07-171-1/+3
|\| |
| * | Update stopwatch circle on RESET_AND_LAUNCH intent.Annie Chin2015-07-171-1/+3
* | | am 9da3a43b: Fix logging call to correctly substituteJames Lemieux2015-07-171-1/+1
|\| |
| * | Fix logging call to correctly substituteJames Lemieux2015-07-161-1/+1
* | | am f283eae0: Merge "Avoid NPE when Screensaver configuration changes" into ub...James Lemieux2015-07-161-4/+8
|\| |
| * | Merge "Avoid NPE when Screensaver configuration changes" into ub-deskclock-bu...James Lemieux2015-07-161-4/+8
| |\ \
| | * | Avoid NPE when Screensaver configuration changesJames Lemieux2015-07-151-4/+8
* | | | am 6b7d6b9b: Canceling PendingIntentDaria Evdokimova2015-07-161-0/+3
|\| | |
| * | | Canceling PendingIntentDaria Evdokimova2015-07-151-0/+3
* | | | am 5602815a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
|\| | |
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-07-1577-3003/+3984
* | | | am 16aa5af8: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
|\| | |
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-07-1579-3993/+3012
| |/ /
* | | am b2ea7132: (-s ours) am 66f75a68: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
|\| |
| * | am 66f75a68: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\|
| | * Import translations. DO NOT MERGEGeoff Mendal2015-07-1578-2657/+2465
* | | am 61a8cfe5: (-s ours) Revert "Import translations. DO NOT MERGE"Geoff Mendal2015-07-150-0/+0
|\| |
| * | Revert "Import translations. DO NOT MERGE"Geoff Mendal2015-07-1579-3012/+3993
* | | am c20c6b32: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
|\| |
| * | Import translations. DO NOT MERGEGeoff Mendal2015-07-1579-3993/+3012
* | | Import translations. DO NOT MERGEGeoff Mendal2015-07-153-9/+9