From: Erik Kline <ek@google.com>
Date: Wed, 11 Oct 2017 12:52:23 +0000 (+0000)
Subject: Merge "IpManager: add display name for helpful logging, and Network"
X-Git-Tag: android-x86-9.0-r1~348^2~1^2~3^2~60
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d0c68dec76;p=android-x86%2Fframeworks-base.git

Merge "IpManager: add display name for helpful logging, and Network"
am: ed0b030e17

Change-Id: I9b5fb4b995e351dfed74bfe83993e379c87305d6
---

d0c68dec76959e612a32963beef220e20dc7c213