OSDN Git Service

Merge "Add explanatory text displayed when 'Always-on' switch is greyed-out for VPN...
authorVictor Chang <vichang@google.com>
Mon, 27 Jun 2016 17:14:50 +0000 (17:14 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 27 Jun 2016 17:14:51 +0000 (17:14 +0000)
commit4ffd7552a36ec3aabe9dbb0b1aba5aa1de704e14
treee7d5edde047b0a7a57e40a81baedf4e05c96fbec
parent8661620b3a1571247e6064dbf62ce035bdd28004
parent52247f69a579c189a881c53d2d021eeffa1609a8
Merge "Add explanatory text displayed when 'Always-on' switch is greyed-out for VPN apps w/targetSdk<24" into nyc-mr1-dev
res/values/strings.xml