tree a0bce9a0035e28503b10585dac1e6d1fd0884d12
parent f0ab37c2b980c496594f496e7b5e12f543485670
parent 6840ffae6761b369992fceb6b880cd9cd600b136
author Lorenzo Colitti <lorenzo@google.com> 1421993448 +0000
committer android-build-merger <android-build-merger@google.com> 1421993448 +0000

am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." into lmp-mr1-dev automerge: fbaf6b3
automerge: 6840ffa

* commit '6840ffae6761b369992fceb6b880cd9cd600b136':
  Use the proper IpPrefix and LinkAddress constructors in VPN code.