| commit | 382b1220de5ba0de78386747108bb16f7f24a9d1 | [log] [tgz] |
|---|---|---|
| author | Song Chun Fan <schfan@google.com> | Wed Mar 22 23:22:23 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 22 23:22:23 2023 +0000 |
| tree | 8be1863b882f7e63e2190c20903d57dea319dc92 | |
| parent | 9fb99b0423e97ca830c808b19b6ddebbb2c8ab36 [diff] | |
| parent | a1dd9bec9eca7a648850d52ec9a8412987c922ac [diff] |
Merge "When the sharedUserSetting of the application on /system is different from the sharedUserSetting on /data, we should trust the sharedUserSetting on /system" am: b51e99de88 am: a1dd9bec9e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481897 Change-Id: I31a3f8b0da89f7321dad6ae4e39feb5bccdbf2e5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>