tree 5b02b8e3278a4f93da4e66683a6fa28832721f27
parent 162d77170967d1871e0fd11924a016b20c7908c6
parent ccd62f22959c259b4744cf2847ddc5dbf0ec2ff4
author Jack Yu <jackyu@google.com> 1531709330 -0700
committer android-build-merger <android-build-merger@google.com> 1531709330 -0700

[automerger skipped] Reordered the params for network registration
am: ccd62f2295  -s ours

Change-Id: I82023b200f07f2e1fe60c0f94616078026cffda7