tree e7d5edde047b0a7a57e40a81baedf4e05c96fbec
parent 8661620b3a1571247e6064dbf62ce035bdd28004
parent 52247f69a579c189a881c53d2d021eeffa1609a8
author Victor Chang <vichang@google.com> 1467047690 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467047691 +0000

Merge "Add explanatory text displayed when 'Always-on' switch is greyed-out for VPN apps w/targetSdk<24" into nyc-mr1-dev