tree 7548d5892aafafdc75e30950b60969947cfa30e0
parent 0a5affed6e7ff29e19149c564cf07e8788fdd1fa
parent cff0a135bae96b476dd6fe6c2e72b449fa0bb7b3
author Stuart Scott <stuartscott@google.com> 1433185591 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433185591 +0000

am cff0a135: am 506a0ad3: am 981d8587: Network Reset should have a lockdown like Factory Reset.

* commit 'cff0a135bae96b476dd6fe6c2e72b449fa0bb7b3':
  Network Reset should have a lockdown like Factory Reset.