From: Robin Lee <rgl@google.com>
Date: Mon, 27 Mar 2017 16:22:56 +0000 (+0000)
Subject: Merge "[VpnSettings]Crash when activity has been recycled"
X-Git-Tag: android-x86-8.1-r1~475^2~2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c834ed1e4e;p=android-x86%2Fpackages-apps-Settings.git

Merge "[VpnSettings]Crash when activity has been recycled"
am: fb81f50c27

Change-Id: I588fc958daacfd0b7859c00c6b5b164e6e02a33d
---

c834ed1e4e50672aca8f09c705818adb4a4972de