[automerger skipped] Merge "Make registrationState consistent with RoamType in case of override" am: ecb5d530c2 am: aa886be6d0 am: 6be5b86947 -s ours

Browse Source

am skip reason: Merged-In Ibf74839f688df587d1f791795924a8152c52e3dc with SHA-1 5153e1b7cf is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2098372

Change-Id: I57f220b58953433077c7e5d7ea520c01905e8a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Ling Ma

2022-05-16 02:45:52 +00:00

committed by Automerger Merge Worker

parent 31bfc4c8e7 6be5b86947

commit b6abce562d

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