| commit | a1dd9bec9eca7a648850d52ec9a8412987c922ac | [log] [tgz] |
|---|---|---|
| author | Song Chun Fan <schfan@google.com> | Wed Mar 22 22:39:07 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 22 22:39:07 2023 +0000 |
| tree | e30a6c5035883b970efd6e37e50b91399f63900a | |
| parent | bc5cc7a8da27e48a31511875f256c07e9ee1e439 [diff] | |
| parent | b51e99de8852a34723457cf41fd37f7153563189 [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 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481897 Change-Id: I26e02c7054edde0b40292f52e643c101b464dd28 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>