summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic translation importstable/cm-13.0-ZNH0Einky@build012016-09-181-0/+3
* Automatic translation importclyde@build012016-08-221-0/+111
* Automatic translation importpinky@build012016-08-181-0/+111
* Automatic translation importclyde@build012016-08-131-0/+111
* Automatic translation importpinky@build012016-06-201-0/+79
* Automatic translation importAbhisek Devkota2016-05-181-0/+1
* Automatic translation importAbhisek Devkota2016-05-1417-0/+1887
* Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/pac...Steve Kondik2015-12-071-4/+45
|\
| * Add extra checks and timeouts to account migration. DO NOT MERGEBenjamin Franz2015-10-141-4/+45
* | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-055-37/+37
|\ \
| * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-200-0/+0
| |\ \ | | |/ | |/|
| | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-250-0/+0
| | |\
| | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-180-0/+0
| | | |\
| | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-060-0/+0
| | | | |\
| | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-050-0/+0
| | | | | |\
| | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-010-0/+0
| | | | | | |\
| | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-300-0/+0
| | | | | | | |\
| | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-290-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-220-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-210-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-180-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-160-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-140-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-120-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-110-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-080-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-060-0/+0
| | | | | | | | | | | | | | | | | |\
| * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-182-34/+34
| |/ / / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / / / Import translations. DO NOT MERGEGeoff Mendal2015-08-241-1/+1
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am eb18ce02: Fix NullPointerException when showing DeleteManagedProfileDialogRubin Xu2015-08-171-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-052-2/+2
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am b1f11c0a: Merge "Increase Wi-Fi connection timeout from 30 to 60 seconds" ...Jukka Zitting2015-08-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5fc43bb5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-3178-78/+78
| * | | | | | | | | | | | | | | | am 45fd7228: Merge "Set device owner as profile owners on secondary users" in...Rubin Xu2015-07-301-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am df02ac7d: Merge "Update the user consent string for device owner provision...Nicolas Prévot2015-07-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am 362e215e: Merge "Ensure ManagedProvisioning finish() calls set result code...Alan Treadway2015-07-284-6/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am 9c64d6b5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-212-1/+102
| | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-2077-0/+154
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 0e9f1183: Strings for the progress dialog shown when clearing FRPEsteban Talavera2015-07-171-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal2015-07-152-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-152-5/+5
| | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am ac0d197d: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 8e1c5db7: Check for invalid Wifi security type in ManagedProvisioningRubin Xu2015-07-131-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 073c85a3: Merge "Warn about theft protection in all provisioning flows." i...Rubin Xu2015-07-134-4/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am adcee75c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-118-17/+17
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am b039f9de: Merge "call startActivityForResult on remove account intent" int...Rubin Xu2015-07-102-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 90d051c3: Merge "Don\'t show Wi-Fi select for EDU secondary users" into mn...Craig Lafayette2015-07-094-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \