tree 0c169584bf07279744d2d640a9930cb18dd1f681
parent a0abd73bc98395793b817ecec6656eea2aad080f
parent 63d7c8d86d95d6d585df62a1b75d4d2999123495
author TreeHugger Robot <treehugger-gerrit@google.com> 1473331937 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1473331940 +0000

Merge "Update icons and strings for always-on VPN info" into nyc-mr1-dev