tree a30770535416bf77cd146d0744e3ca427aabe35c
parent 1b9e12f9a082918aada6dd57f6f388c29125c1db
parent 917c547beb9adecf2e7d2b355e85e37c2557c5d3
author Lorenzo Colitti <lorenzo@google.com> 1413451367 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413451367 +0000

am 917c547b: Merge "Don\'t make lockdown VPN source firewall rules over-broad." into lmp-dev

* commit '917c547beb9adecf2e7d2b355e85e37c2557c5d3':
  Don't make lockdown VPN source firewall rules over-broad.