diff options
| author | 2022-04-20 22:44:50 +0000 | |
|---|---|---|
| committer | 2022-04-20 22:44:50 +0000 | |
| commit | e1be235367b3ed2906dafa3f9601022e2f497fa8 (patch) | |
| tree | 99474b53eb7687d617dbcc06a1bd7a2ca200fb95 /libs/androidfw/StringPool.cpp | |
| parent | 65dc0639fcab9769f8e124acd152ffef2c9f6ef4 (diff) | |
| parent | 3989351a10f5aa2d1b2abceba7ee8c8fa9531b49 (diff) | |
Merge changes from topic "am-28d457cd546149c3b2acf232ddb9ed91" into tm-dev
* changes:
[automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea08 am: 5526853e6d -s ours am: ff2c282fb4 -s ours am: a7f9adbc94 -s ours
[automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 0762961674 am: 4df21cf7ca -s ours am: 54a7bd48dc -s ours am: fc90023265 -s ours
[automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e987337 am: be952611ed -s ours am: 0f285346e5 -s ours am: 74699e901a -s ours
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd16 am: 4eadb46170 -s ours am: ef37c0da49 -s ours am: 468c5c5a2f -s ours
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70c6 am: d685b63f1a -s ours am: 39bf332aab -s ours am: 79f227182b -s ours
[automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ecbf am: ee88d1fd14 -s ours am: a86355bfef -s ours am: ceb59ff994 -s ours
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions