OSDN Git Service

Merge changes from topic "always-on-vpn" am: cc15c7f8c1 am: 692b55390f
authorCharles He <qiurui@google.com>
Tue, 19 Sep 2017 08:17:12 +0000 (08:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Sep 2017 08:17:12 +0000 (08:17 +0000)
am: 01014743c0

Change-Id: Ide329f8e32538f4643e727697b35bfc2b7007f57


Trivial merge