commit | 1c9c4b724fddc338433e2bafbdb00e7eb03b12a4 | [log] [tgz] |
---|---|---|
author | Robin Lee <rgl@google.com> | Wed Jul 06 10:38:22 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jul 06 10:38:22 2016 +0000 |
tree | 996ccf841bbef7e53920391c94ba9b37a10e3393 | |
parent | a63c20b3b6daa1dd348be78030c2c121d03af449 [diff] | |
parent | 2ac7bc0565a8bb3f01f9afaf7b62448b64dca58e [diff] |
Merge \\"Don\\'t show always-on option connecting PPTP vpn\\" into nyc-mr1-dev am: 1926ed9f83 am: 2ac7bc0565 Change-Id: I5945bb58dc952bc149a03325013f0904d5157847