tree 044aff5dab504e20637665064701fe4f33f4f79d
parent 58ef88927d5e28318920a135bba8edf5409115fe
parent bae6d820d2227754bcaa341621d270ba39b59820
author Robin Lee <rgl@google.com> 1467820640 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467820643 +0000

Merge "Update isValidLockdownProfile to block PPTP" into nyc-mr1-dev