tree 86a7768d7ff52d094f0ee4bf50084566cd747e9f
parent 9b8af6e778c0cf9da6f5bacfdc8687a1af7e18a4
parent d94854030c76fc4ee4126ca1707a76fbd1f29126
author Lorenzo Colitti <lorenzo@google.com> 1411487459 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411487459 +0000

am d9485403: Merge "Include the VPN server IP address in the VPN state file." into lmp-dev

* commit 'd94854030c76fc4ee4126ca1707a76fbd1f29126':
  Include the VPN server IP address in the VPN state file.