commit | 2ac7bc0565a8bb3f01f9afaf7b62448b64dca58e | [log] [tgz] |
---|---|---|
author | Robin Lee <rgl@google.com> | Wed Jul 06 10:35:11 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jul 06 10:35:11 2016 +0000 |
tree | bd56f172ade8ce232fb94e93067a1f6b06059e3a | |
parent | b62a70db9304ffa1d2aad1d61d3822770701084c [diff] | |
parent | 1926ed9f83062a5a22c865c746f9a423584a050d [diff] |
Merge \"Don\'t show always-on option connecting PPTP vpn\" into nyc-mr1-dev am: 1926ed9f83 Change-Id: I98de935857099b26946a66a884908cdcf470e11a