tree 1452a166d4826730f2fbb9d62807e851145a1467
parent 0d35765ca343ae7b04df7a93c233e5b6860eec22
parent 628ae0d84180c5f7c52725e02506021e532ed252
author Robin Lee <rgl@google.com> 1464306087 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464306088 +0000

Merge "Move VPN restriction check into setup dialog" into nyc-dev