Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/pa...staging/cm-13.0+r22 | Steve Kondik | 2016-03-10 | 78 | -3658/+2620 |
|\ | |||||
| * | Import translations. DO NOT MERGE | Geoff Mendal | 2015-10-21 | 0 | -0/+0 |
| |\ | |||||
| | * | Import translations. DO NOT MERGE | Geoff Mendal | 2015-10-21 | 78 | -135/+390 |
| * | | am 2b9ba699: am 9e7ee617: Add extra checks and timeouts to account migration.... | Benjamin Franz | 2015-10-15 | 1 | -4/+45 |
| |\| | |||||
| | * | am 9e7ee617: Add extra checks and timeouts to account migration. DO NOT MERGE | Benjamin Franz | 2015-10-15 | 1 | -4/+45 |
| | |\ | |||||
| * | | | am a45143a4: (-s ours) am 6481079e: (-s ours) Import translations. DO NOT MERGE | Baligh Uddin | 2015-09-19 | 0 | -0/+0 |
| |\| | | |||||
| | * | | am 6481079e: (-s ours) Import translations. DO NOT MERGE | Baligh Uddin | 2015-09-19 | 0 | -0/+0 |
| | |\ \ | |||||
| * | | | | am 236d42fb: (-s ours) am 03f45324: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-08-24 | 0 | -0/+0 |
| |\| | | | |||||
| | * | | | am 03f45324: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-08-24 | 0 | -0/+0 |
| | |\ \ \ | |||||
| * | | | | | am 4fff153a: am 88a52512: am eb18ce02: Fix NullPointerException when showing ... | Rubin Xu | 2015-08-17 | 1 | -1/+4 |
| |\| | | | | |||||
| | * | | | | am 88a52512: am eb18ce02: Fix NullPointerException when showing DeleteManaged... | Rubin Xu | 2015-08-17 | 1 | -1/+4 |
| | |\ \ \ \ | |||||
| * | | | | | | am f49e905d: (-s ours) am 9fac104a: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-08-05 | 0 | -0/+0 |
| |\| | | | | | |||||
| | * | | | | | am 9fac104a: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-08-05 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
| * | | | | | | | am 75619bd5: am abe7192f: am b1f11c0a: Merge "Increase Wi-Fi connection timeo... | Jukka Zitting | 2015-08-04 | 1 | -1/+1 |
| |\| | | | | | | |||||
| | * | | | | | | am abe7192f: am b1f11c0a: Merge "Increase Wi-Fi connection timeout from 30 to... | Jukka Zitting | 2015-08-04 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| * | | | | | | | | am 6e79920f: (-s ours) am 74afa0d1: (-s ours) am 5fc43bb5: (-s ours) Import t... | Geoff Mendal | 2015-08-04 | 0 | -0/+0 |
| |\| | | | | | | | |||||
| | * | | | | | | | am 74afa0d1: (-s ours) am 5fc43bb5: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-08-04 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | | am f09fff29: (-s ours) am a869a36a: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-08-01 | 0 | -0/+0 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | am a869a36a: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-08-01 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | am b1a2014e: am 5fa0ad4a: am 45fd7228: Merge "Set device owner as profile own... | Rubin Xu | 2015-07-30 | 1 | -0/+13 |
| |\| | | | | | | | | | |||||
| | * | | | | | | | | | am 5fa0ad4a: am 45fd7228: Merge "Set device owner as profile owners on second... | Rubin Xu | 2015-07-30 | 1 | -0/+13 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | am 4da7081b: am b60d3628: am df02ac7d: Merge "Update the user consent string ... | Nicolas Prévot | 2015-07-29 | 1 | -1/+1 |
| |\| | | | | | | | | | | |||||
| | * | | | | | | | | | | am b60d3628: am df02ac7d: Merge "Update the user consent string for device ow... | Nicolas Prévot | 2015-07-29 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | am 1463e64d: am 6c1980bc: am 362e215e: Merge "Ensure ManagedProvisioning fini... | Alan Treadway | 2015-07-28 | 4 | -6/+10 |
| |\| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | am 6c1980bc: am 362e215e: Merge "Ensure ManagedProvisioning finish() calls se... | Alan Treadway | 2015-07-28 | 4 | -6/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | am cf862bd0: (-s ours) am d610e69b: (-s ours) am 9c64d6b5: (-s ours) Import t... | Geoff Mendal | 2015-07-21 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | am d610e69b: (-s ours) am 9c64d6b5: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-21 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | am 915cebd6: (-s ours) am a264f086: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-21 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | am a264f086: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-21 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | am c7beecd0: (-s ours) am b28a3f90: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-20 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | am b28a3f90: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | am 13dbe636: am f1c2dc56: am 0e9f1183: Strings for the progress dialog shown ... | Esteban Talavera | 2015-07-17 | 1 | -2/+4 |
| |\| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | am f1c2dc56: am 0e9f1183: Strings for the progress dialog shown when clearing... | Esteban Talavera | 2015-07-17 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | am ae8a0e23: (-s ours) am 139ca533: (-s ours) Merge "Import translations. DO ... | Geoff Mendal | 2015-07-15 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | am 139ca533: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev | Geoff Mendal | 2015-07-15 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | am 55cf31d9: (-s ours) am 05c0531a: (-s ours) am ac0d197d: (-s ours) Import t... | Geoff Mendal | 2015-07-15 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | am 05c0531a: (-s ours) am ac0d197d: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-15 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | am 13dc7ba5: am e12df056: am 8e1c5db7: Check for invalid Wifi security type i... | Rubin Xu | 2015-07-14 | 1 | -1/+10 |
| |\| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | am e12df056: am 8e1c5db7: Check for invalid Wifi security type in ManagedProv... | Rubin Xu | 2015-07-13 | 1 | -1/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | am 8c066246: am a7a0d81b: am 073c85a3: Merge "Warn about theft protection in ... | Rubin Xu | 2015-07-14 | 4 | -4/+40 |
| |\| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | am a7a0d81b: am 073c85a3: Merge "Warn about theft protection in all provision... | Rubin Xu | 2015-07-13 | 4 | -4/+40 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | am bef36a91: (-s ours) am 62e6170e: (-s ours) am adcee75c: (-s ours) Import t... | Geoff Mendal | 2015-07-14 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | am 62e6170e: (-s ours) am adcee75c: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-13 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | am f066eb97: (-s ours) am 649dc46a: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-13 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | am 649dc46a: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-13 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | am e49d06c9: am 3284ddf0: am b039f9de: Merge "call startActivityForResult on ... | Rubin Xu | 2015-07-10 | 2 | -3/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | am 3284ddf0: am b039f9de: Merge "call startActivityForResult on remove accoun... | Rubin Xu | 2015-07-10 | 2 | -3/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | am 1109c849: am f9bab601: am 90d051c3: Merge "Don\'t show Wi-Fi select for ED... | Craig Lafayette | 2015-07-09 | 4 | -4/+10 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | am f9bab601: am 90d051c3: Merge "Don\'t show Wi-Fi select for EDU secondary u... | Craig Lafayette | 2015-07-09 | 4 | -4/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 1776a29c: (-s ours) am e91e0567: (-s ours) am a0cc1d21: (-s ours) Import t... | Geoff Mendal | 2015-07-08 | 0 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | |