Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | am a0cc1d21: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-08 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | am 0ed91ac2: Merge "Also fetch disabled activities when disabling system apps... | Esteban Talavera | 2015-07-07 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | am d03eacd8: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-06 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | | | | | | | | | | | Updated to support new cypto_complete states. | Shay Nachmani | 2015-10-06 | 1 | -2/+3 | |
* | | | | | | | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-08-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-08-05 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-08-04 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-08-01 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-30 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-29 | 0 | -0/+0 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | | | | | | | | ||||||
| | | | | | * | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-22 | 0 | -0/+0 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | | |/| | | | | | | | | | | | | | ||||||
| | | | | | | * | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-18 | 0 | -0/+0 | |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ / | | | | | | | |/| | | | | | | | | | | | | ||||||
| | | | | | | | * | | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-16 | 0 | -0/+0 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / | | | | | | | | |/| | | | | | | | | | | | ||||||
| | | | | | | | | * | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-14 | 0 | -0/+0 | |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |_|_|_|_|_|_|_|_|/ / | | | | | | | | | |/| | | | | | | | | | | ||||||
| | | | | | | | | | * | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-13 | 0 | -0/+0 | |
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |_|_|_|_|_|_|/ / / | | | | | | | | | | |/| | | | | | | | | | ||||||
| | | | | | | | | | | * | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-09 | 0 | -0/+0 | |
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |_|_|_|/ / / / / | | | | | | | | | | | |/| | | | | | | | | ||||||
| | | | | | | | | | | | * | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-08 | 0 | -0/+0 | |
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | |_|_|/ / / / / | | | | | | | | | | | | |/| | | | | | | | ||||||
| | | | | | | | | | | | | * | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-07 | 0 | -0/+0 | |
| | | | | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | |_|/ / / / / | | | | | | | | | | | | | |/| | | | | | | ||||||
| | | | | | | | | | | | | | * | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-01 | 0 | -0/+0 | |
| | | | | | | | | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | * \ \ \ \ \ | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-27 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | * \ \ \ \ \ | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-25 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | * \ \ \ \ \ | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-24 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | * \ \ \ \ \ | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-23 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | |_|_|_|/ | | | | | | | | | | | | | | | | | | | |/| | | | | ||||||
| | | | | | | | | | | | | | | | | | | * | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-18 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | * \ \ \ \ | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-17 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | * \ \ \ \ | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-16 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-15 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix NullPointerException when showing DeleteManagedProfileDialog | Rubin Xu | 2015-08-14 | 1 | -1/+4 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Increase Wi-Fi connection timeout from 30 to 60 seconds" into mnc-dev | Jukka Zitting | 2015-08-04 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Increase Wi-Fi connection timeout from 30 to 60 seconds | Jukka Zitting | 2015-07-28 | 1 | -1/+1 | |
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-08-03 | 78 | -78/+78 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Set device owner as profile owners on secondary users" into mnc-dev | Rubin Xu | 2015-07-30 | 1 | -0/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Set device owner as profile owners on secondary users | Rubin Xu | 2015-07-29 | 1 | -0/+13 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update the user consent string for device owner provisioning flow." in... | Nicolas Prévot | 2015-07-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Update the user consent string for device owner provisioning flow. | Nicolas Prevot | 2015-07-28 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Ensure ManagedProvisioning finish() calls set result code." into mnc-dev | Alan Treadway | 2015-07-28 | 4 | -6/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Ensure ManagedProvisioning finish() calls set result code. | Alan Treadway | 2015-07-22 | 4 | -6/+10 | |
| |/ / / / / / / / / / / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / / / / / / / / / / | Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-21 | 78 | -1/+256 | |
|/ / / / / / / / / / / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / / / / / / / / / | Strings for the progress dialog shown when clearing FRP | Esteban Talavera | 2015-07-17 | 1 | -2/+4 | |
|/ / / / / / / / / / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / / / / / / / / | Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-15 | 2 | -5/+5 | |
|/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | / | Check for invalid Wifi security type in ManagedProvisioning | Rubin Xu | 2015-07-13 | 1 | -1/+10 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | Merge "Warn about theft protection in all provisioning flows." into mnc-dev | Rubin Xu | 2015-07-13 | 4 | -4/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | Warn about theft protection in all provisioning flows. | Rubin Xu | 2015-07-10 | 4 | -4/+40 | |
| |/ / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | / | Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-11 | 1 | -1/+1 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge "call startActivityForResult on remove account intent" into mnc-dev | Rubin Xu | 2015-07-10 | 2 | -3/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | call startActivityForResult on remove account intent | Rubin Xu | 2015-07-09 | 2 | -3/+2 | |
| |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | Merge "Don't show Wi-Fi select for EDU secondary users" into mnc-dev | Craig Lafayette | 2015-07-09 | 4 | -4/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Don't show Wi-Fi select for EDU secondary users | Craig Lafayette | 2015-07-08 | 4 | -4/+10 | |
| |/ / / / / / / / / / / / / | ||||||
* / / / / / / / / / / / / / | Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-08 | 4 | -13/+13 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge "Also fetch disabled activities when disabling system apps." into mnc-dev | Esteban Talavera | 2015-07-07 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | |