From: Chalard Jean <jchalard@google.com>
Date: Thu, 1 Mar 2018 05:48:14 +0000 (+0000)
Subject: Merge "Fix up NetworkCapabilities' toString"
X-Git-Tag: android-x86-9.0-r1~192^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=773523a6672952fe8fb844db3e73c6fc853a2f31;p=android-x86%2Fframeworks-base.git

Merge "Fix up NetworkCapabilities' toString"
am: 7959e70ef2

Change-Id: I21e66bc78a763f9e37725f50ca8b406ac7259518
---

773523a6672952fe8fb844db3e73c6fc853a2f31