tree 3bc8bc22853f9d1af29930ea4f32e5e7cf490c26
parent b0a4c897ac624f275cca392183993ac51a0e3b2a
parent 07127d83a6320f41a0fe5a05608917cc30ea1849
author Robin Lee <rgl@google.com> 1467801012 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467801013 +0000

Merge "Don't show always-on option connecting PPTP vpn" into nyc-mr1-dev