GitLab

Auto-generated-cl: translation import

Bug: 27293916
Change-Id: I9bd57c3344b0ab68211f8d3c46905f0533826526

am: 78f1c775  -s ours

* commit '78f1c775':
  Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 25433205
Change-Id: Ie90918d6052cee7cdc74ca06aafd7071228d8515

am: 5b52ff6a

* commit '5b52ff6a':
  Add extra checks and timeouts to account migration

am: e01ba4c8

* commit 'e01ba4c8':
  Add extra checks and timeouts to account migration

am: c70c2096  -s ours

* commit 'c70c2096':
  Import translations. DO NOT MERGE

am: 5e719562  -s ours

* commit '5e719562':
  Import translations. DO NOT MERGE

Change-Id: Ie66e7d876fd340d4f85d5b431bc52e0bc117a354
Auto-generated-cl: translation import

am cbbd48b7: am 2b9ba699: am 9e7ee617: Add extra checks and timeouts to account migration. DO NOT MERGE

* commit 'cbbd48b7':
  Add extra checks and timeouts to account migration. DO NOT MERGE

* commit '2b9ba699':
  Add extra checks and timeouts to account migration. DO NOT MERGE

* commit '9e7ee617':
  Add extra checks and timeouts to account migration. DO NOT MERGE

Adding an extra check to verify that the account type is ready on the
target user. Also, adding a timeout to the copyAccountToUser call to
avoid managed provisioning getting stuck in an endless loop in case
somehting goes wrong here.

Bug: 23798494
Change-Id: Ieea43bbd9c3db29c125eff342aadb86b242cba91

Adding an extra check to verify that the account type is ready on the
target user. Also, adding a timeout to the copyAccountToUser call to
avoid managed provisioning getting stuck in an endless loop in case
somehting goes wrong here.

Bug: 23798494
Change-Id: Ieea43bbd9c3db29c125eff342aadb86b242cba91

* commit 'e56e7b4f':
  Import translations. DO NOT MERGE

Change-Id: I675c7d604464f2898708c21f4540a373e10e97ae
Auto-generated-cl: translation import

am 7dd68bc0: (-s ours) am a45143a4: (-s ours) am 6481079e: (-s ours) Import translations. DO NOT MERGE

* commit '7dd68bc0':
  Import translations. DO NOT MERGE

* commit 'a45143a4':
  Import translations. DO NOT MERGE

* commit '6481079e':
  Import translations. DO NOT MERGE

Change-Id: I09633062a0bd326a83b47ec639d25f738f8a2ff5
Auto-generated-cl: translation import

am 2d0b2a37: (-s ours) am eb18ce02: Fix NullPointerException when showing DeleteManagedProfileDialog

* commit '2d0b2a37':

am d5a87316: (-s ours) am b1f11c0a: Merge "Increase Wi-Fi connection timeout from 30 to 60 seconds" into mnc-dev

* commit 'd5a87316':

* commit '115d40a3':

am 61062320: (-s ours) am 45fd7228: Merge "Set device owner as profile owners on secondary users" into mnc-dev

* commit '61062320':

am 55355be4: (-s ours) am df02ac7d: Merge "Update the user consent string for device owner provisioning flow." into mnc-dev

* commit '55355be4':

am e01dbc8e: (-s ours) am 362e215e: Merge "Ensure ManagedProvisioning finish() calls set result code." into mnc-dev

* commit 'e01dbc8e':

* commit '252e578c':

* commit '8d886887':

* commit '5674befb':

* commit '7f54deae':

am 64ac7d61: (-s ours) am 073c85a3: Merge "Warn about theft protection in all provisioning flows." into mnc-dev

* commit '64ac7d61':

* commit 'a15f62db':

am 76768296: (-s ours) am b039f9de: Merge "call startActivityForResult on remove account intent" into mnc-dev

* commit '76768296':

am 1759997d: (-s ours) am 90d051c3: Merge "Don\'t show Wi-Fi select for EDU secondary users" into mnc-dev

* commit '1759997d':

* commit '9ec1dfae':

am d7b8b516: (-s ours) am bea26c15: (-s ours) am 1605a05a: (-s ours) DO NOT MERGE: Import translations.

* commit 'd7b8b516':

am 6c3ccdf0: (-s ours) am 0ed91ac2: Merge "Also fetch disabled activities when disabling system apps." into mnc-dev

* commit '6c3ccdf0':

* commit '9b4453e3':

am 82fb37a7: (-s ours) am 2cee833b: Merge "Comment that account migration must happen after setting the profile owner." into mnc-dev

* commit '82fb37a7':

am 8b9c615a: (-s ours) am 236d42fb: (-s ours) am 03f45324: (-s ours) Import translations. DO NOT MERGE

* commit '8b9c615a':
  Import translations. DO NOT MERGE

* commit '236d42fb':
  Import translations. DO NOT MERGE