tree 5cc42a84ba7b9dcc0581abea05a06ab20a595b97
parent 3ae13079292aad71c5df4ba935a470209716bdb0
parent 5d5cd1f27d85f5b90573b31f80e860cc2c4ba4a8
author Lorenzo Colitti <lorenzo@google.com> 1417639323 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417639323 +0000

am b79b5e8d: Merge "Add a CTS test for the VPN API." into lmp-mr1-dev

* commit 'b79b5e8d868cdf28f7edd1b7e37dc380df43a91f':
  Add a CTS test for the VPN API.