OSDN Git Service

Merge \\"Add explanatory text displayed when \\'Always-on\\' switch is greyed-out...
authorVictor Chang <vichang@google.com>
Mon, 27 Jun 2016 17:51:30 +0000 (17:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 27 Jun 2016 17:51:30 +0000 (17:51 +0000)
commit2d97a6a9fe7d7518f6072d03596f45d75fd2cdf3
treec0833062c503cdc62412a6fbfb44df2662ae8456
parent68da9b2f34b5932ff6de3b8e483bb0c90e81d0bd
parent8dc82cb43671f4240d7a7bf21346c87b81c4acbf
Merge \\"Add explanatory text displayed when \\'Always-on\\' switch is greyed-out for VPN apps w/targetSdk<24\\" into nyc-mr1-dev am: 4ffd7552a3
am: 8dc82cb436

Change-Id: I826f79e845be20f687b96ba5ba551da13422fcee
res/values/strings.xml