Merge changes from topic "am-40c3a0dafb1849c6adf94ab30f1f6406"

Browse Source

* changes:
  [automerger skipped] Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25dff4 am: 81d8843b6e -s ours am: bbc3c5458c -s ours am: 06d0d7e61b -s ours am: 5e4422f823 -s ours
  [automerger skipped] Ignore errors preparing user storage for existing users am: e667b60402 am: 8ea6cb03ff -s ours am: e540487397 -s ours am: 1b7d8da8e3 -s ours am: 77871ac7c8 -s ours
  [automerger skipped] UserDataPreparer: reboot to recovery for system user only am: fd31f740ce am: 0d80797d8f -s ours am: ddda347441 -s ours am: 2d0e7e6d89 -s ours am: 4ffee68ffe -s ours
  [automerger skipped] UserDataPreparer: reboot to recovery if preparing user storage fails am: e1f17026ca am: 4bf1a4ac01 -s ours am: aefe95dbf2 -s ours am: dc04779c18 -s ours am: dab4b4e404 -s ours

...

This commit is contained in:

Automerger Merge Worker

2022-04-20 21:30:01 +00:00

committed by Android (Google) Code Review

parent 4b1892d180 efddc40c6f

commit b45a3bc700

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available