tree 561e63fe8747b4bfa44d96d2a5074d01c5ba680f
parent 11f6f218d9c04209abbdfb9bb17b75a4f1b898d6
parent 5e62891a8a2665262bf4e2e2fe1b91e9187c8a0d
author Paul Hu <paulhu@google.com> 1614738134 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614738134 +0000

[automerger skipped] Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" am: 18a60acfdf am: 9bd19b3127 am: 5e62891a8a -s ours

am skip reason: Change-Id I6f03398c1735b89470ad5bdbe3a036929daeb53c with SHA-1 694c8a9935 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9e11c925da1cb7a94c812f68b60c77350c26770