summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | am a0cc1d21: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 0ed91ac2: Merge "Also fetch disabled activities when disabling system apps...Esteban Talavera2015-07-071-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am d03eacd8: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | Updated to support new cypto_complete states.Shay Nachmani2015-10-061-2/+3
* | | | | | | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-08-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-300-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-290-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-220-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | | |/| | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-180-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | | | | | |/| | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-160-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / | | | | | | | | |/| | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-140-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |_|_|_|_|_|_|_|_|/ / | | | | | | | | | |/| | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-130-0/+0
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |_|_|_|_|_|_|/ / / | | | | | | | | | | |/| | | | | | | | |
| | | | | | | | | | | * | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-090-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |_|_|_|/ / / / / | | | | | | | | | | | |/| | | | | | | |
| | | | | | | | | | | | * | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-080-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | |_|_|/ / / / / | | | | | | | | | | | | |/| | | | | | |
| | | | | | | | | | | | | * | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-070-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | |_|/ / / / / | | | | | | | | | | | | | |/| | | | | |
| | | | | | | | | | | | | | * | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-010-0/+0
| | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | * \ \ \ \ \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-270-0/+0
| | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ \ \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-250-0/+0
| | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-240-0/+0
| | | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-230-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | |_|_|_|/ | | | | | | | | | | | | | | | | | | | |/| | | |
| | | | | | | | | | | | | | | | | | | * | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-180-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | | * \ \ \ \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-170-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | * \ \ \ \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-160-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-150-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix NullPointerException when showing DeleteManagedProfileDialogRubin Xu2015-08-141-1/+4
|/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Increase Wi-Fi connection timeout from 30 to 60 seconds" into mnc-devJukka Zitting2015-08-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Increase Wi-Fi connection timeout from 30 to 60 secondsJukka Zitting2015-07-281-1/+1
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-0378-78/+78
| |/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Set device owner as profile owners on secondary users" into mnc-devRubin Xu2015-07-301-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Set device owner as profile owners on secondary usersRubin Xu2015-07-291-0/+13
| |/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Update the user consent string for device owner provisioning flow." in...Nicolas Prévot2015-07-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Update the user consent string for device owner provisioning flow.Nicolas Prevot2015-07-281-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "Ensure ManagedProvisioning finish() calls set result code." into mnc-devAlan Treadway2015-07-284-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Ensure ManagedProvisioning finish() calls set result code.Alan Treadway2015-07-224-6/+10
| |/ / / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / / Import translations. DO NOT MERGEGeoff Mendal2015-07-2178-1/+256
|/ / / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / Strings for the progress dialog shown when clearing FRPEsteban Talavera2015-07-171-2/+4
|/ / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / Import translations. DO NOT MERGEGeoff Mendal2015-07-152-5/+5
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | / Check for invalid Wifi security type in ManagedProvisioningRubin Xu2015-07-131-1/+10
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Warn about theft protection in all provisioning flows." into mnc-devRubin Xu2015-07-134-4/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Warn about theft protection in all provisioning flows.Rubin Xu2015-07-104-4/+40
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | / Import translations. DO NOT MERGEGeoff Mendal2015-07-111-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "call startActivityForResult on remove account intent" into mnc-devRubin Xu2015-07-102-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | call startActivityForResult on remove account intentRubin Xu2015-07-092-3/+2
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "Don't show Wi-Fi select for EDU secondary users" into mnc-devCraig Lafayette2015-07-094-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Don't show Wi-Fi select for EDU secondary usersCraig Lafayette2015-07-084-4/+10
| |/ / / / / / / / / / / / /
* / / / / / / / / / / / / / Import translations. DO NOT MERGEGeoff Mendal2015-07-084-13/+13
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Also fetch disabled activities when disabling system apps." into mnc-devEsteban Talavera2015-07-071-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |