tree c27cc694fddd138feaeec314d80695679eee4e93
parent 1d9709071dbac83f3cd3ec5efa4652531b78c3d6
parent 17c2040532f820fd7fdee5d57e0bfeb55ea62e43
author Mark Chien <markchien@google.com> 1602068173 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602068173 +0000

Merge "Make the IP subnet persistent till reboot" am: 818da784dd am: fabe5787f0 am: 17c2040532

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

Change-Id: I6d76e970384a3021e1fe519a268627628f45d446