| commit | aed299868bff1b11d3be65976759d6a82f9b99db | [log] [tgz] |
|---|---|---|
| author | Song Chun Fan <schfan@google.com> | Thu Mar 23 00:19:06 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 23 00:19:06 2023 +0000 |
| tree | 6b1ba904573d2f56adc4420e311f9775b7076967 | |
| parent | ab0b751aef8117dde41b34e2d8e4b2c9a8c6765a [diff] | |
| parent | 382b1220de5ba0de78386747108bb16f7f24a9d1 [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 am: 382b1220de Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481897 Change-Id: I981e3fd9dad7d4cdac804939715c0fac4f8e1d82 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>