tree ded197770cb20d0f38f6ac38ac8f4362586f134d
parent 41d8d275f33830a4287879c5d326e30471823af5
parent f9062b4750bd26f07da4e94ace1f9c97a5b7fd53
author Jack Yu <jackyu@google.com> 1553066777 -0700
committer android-build-merger <android-build-merger@google.com> 1553066777 -0700

[automerger skipped] Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" am: 91f335acbe am: b514d240d2
am: f9062b4750 -s ours
am skip reason: change_id I730ce02739db1e102a710b45681bac887777a61f with SHA1 09c90af4da is in history

Change-Id: I990d625ac9877508bf1a7930d12f6c3d148b607f