tree e3aa41f46a0e2c41381440793329a8b06c7125ea
parent ce39d25f2c5908c3f6067a70b2ab504929e2eb5f
parent 28dcf0345b2857884c1f1639fadb720318445187
author Lorenzo Colitti <lorenzo@google.com> 1413451397 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413451397 +0000

am 28dcf034: Merge "Propagate network state changes to the LockdownVpnTracker." into lmp-dev

* commit '28dcf0345b2857884c1f1639fadb720318445187':
  Propagate network state changes to the LockdownVpnTracker.