summaryrefslogtreecommitdiff
path: root/src/com/android/server/NetworkStackService.java
diff options
context:
space:
mode:
authorJack Yu <jackyu@google.com>2019-03-20 00:25:29 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-03-20 00:25:29 -0700
commit7f5c14579457f3c2982ae66725cb3098dfcb928b (patch)
treee4f52ca82761a8133af9b56d197067ca7ed900e1 /src/com/android/server/NetworkStackService.java
parent2badf48ca6505f77ec09ec52bdeeefda813c6391 (diff)
parent6bc1865fc5d0affd6b1b478c2914336eb797a5d5 (diff)
[automerger skipped] Merge "Renamed NetworkRegistrationState to NetworkRegistrationInfo" am: 936c536bba am: 55e73c27a8
am: dc025370cd -s ours am skip reason: change_id I8af36b388182ab08257b64c37078f156d4821709 with SHA1 e27d3fde88 is in history Change-Id: I15947c878571752d578b65813a1592487155d8ed
Diffstat (limited to 'src/com/android/server/NetworkStackService.java')
0 files changed, 0 insertions, 0 deletions