summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic translation importHEADreplicant-6.0-0004-rc1cm-13.0Abhisek Devkota2017-12-143-0/+333
* Automatic translation importreplicant-6.0-0003Abhisek Devkota2017-09-201-11/+0
* Automatic translation importreplicant-6.0-0002Abhisek Devkota2017-06-041-0/+1
* Automatic translation importreplicant-6.0-0001Abhisek Devkota2017-04-281-69/+0
* Automatic translation importAbhisek Devkota2017-02-201-0/+111
* Automatic translation importAbhisek Devkota2017-01-2618-18/+0
* Automatic translation importblinky@build012016-12-2318-0/+18
* Automatic translation importpinky@build012016-09-251-0/+3
* Merge "Automatic translation import" into cm-13.0Jessica Wagantall2016-08-290-0/+0
|\
| * Automatic translation importpinky@build012016-08-283-0/+333
* | Automatic translation importpinky@build012016-08-273-0/+333
|/
* Automatic translation importblinky@build012016-06-201-0/+17
* Automatic translation importinky@build012016-06-171-0/+62
* Fix NL translation after r22 revertMichael Bestas2016-05-221-8/+8
* Automatic translation importAbhisek Devkota2016-05-171-0/+1
* Revert "Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/pla...Michael Bestas2016-05-0178-2620/+3658
* Automatic translation importMichael Bestas2016-04-161-0/+111
* Automatic translation importMichael Bestas2016-04-051-0/+111
* Automatic translation importMichael Bestas2016-03-272-0/+222
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/pa...staging/cm-13.0+r22Steve Kondik2016-03-1178-3658/+2620
|\
| * Import translations. DO NOT MERGEGeoff Mendal2015-10-210-0/+0
| |\
| | * Import translations. DO NOT MERGEGeoff Mendal2015-10-2178-135/+390
| * | am 2b9ba699: am 9e7ee617: Add extra checks and timeouts to account migration....Benjamin Franz2015-10-151-4/+45
| |\ \ | | |/
| | * am 9e7ee617: Add extra checks and timeouts to account migration. DO NOT MERGEBenjamin Franz2015-10-151-4/+45
| | |\
| * | \ am a45143a4: (-s ours) am 6481079e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\ \ \ | | |/ /
| | * | am 6481079e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\ \
| * | \ \ am 236d42fb: (-s ours) am 03f45324: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-240-0/+0
| |\ \ \ \ | | |/ / /
| | * | | am 03f45324: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-240-0/+0
| | |\ \ \
| * | \ \ \ am 4fff153a: am 88a52512: am eb18ce02: Fix NullPointerException when showing ...Rubin Xu2015-08-171-1/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 88a52512: am eb18ce02: Fix NullPointerException when showing DeleteManaged...Rubin Xu2015-08-171-1/+4
| | |\ \ \ \
| * | \ \ \ \ am f49e905d: (-s ours) am 9fac104a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-050-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 9fac104a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-050-0/+0
| | |\ \ \ \ \
| * | \ \ \ \ \ am 75619bd5: am abe7192f: am b1f11c0a: Merge "Increase Wi-Fi connection timeo...Jukka Zitting2015-08-041-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am abe7192f: am b1f11c0a: Merge "Increase Wi-Fi connection timeout from 30 to...Jukka Zitting2015-08-041-1/+1
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ am 6e79920f: (-s ours) am 74afa0d1: (-s ours) am 5fc43bb5: (-s ours) Import t...Geoff Mendal2015-08-040-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 74afa0d1: (-s ours) am 5fc43bb5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-040-0/+0
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ am f09fff29: (-s ours) am a869a36a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-010-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am a869a36a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-010-0/+0
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ am b1a2014e: am 5fa0ad4a: am 45fd7228: Merge "Set device owner as profile own...Rubin Xu2015-07-301-0/+13
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 5fa0ad4a: am 45fd7228: Merge "Set device owner as profile owners on second...Rubin Xu2015-07-301-0/+13
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ am 4da7081b: am b60d3628: am df02ac7d: Merge "Update the user consent string ...Nicolas Prévot2015-07-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am b60d3628: am df02ac7d: Merge "Update the user consent string for device ow...Nicolas Prévot2015-07-291-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ am 1463e64d: am 6c1980bc: am 362e215e: Merge "Ensure ManagedProvisioning fini...Alan Treadway2015-07-284-6/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 6c1980bc: am 362e215e: Merge "Ensure ManagedProvisioning finish() calls se...Alan Treadway2015-07-284-6/+10
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ am cf862bd0: (-s ours) am d610e69b: (-s ours) am 9c64d6b5: (-s ours) Import t...Geoff Mendal2015-07-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am d610e69b: (-s ours) am 9c64d6b5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ am 915cebd6: (-s ours) am a264f086: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am a264f086: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ am c7beecd0: (-s ours) am b28a3f90: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am b28a3f90: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \