tree d68d1b88e1fe18888d93c4e102ed279d8b43c00b
parent e03f2cb2c26d30c277d38566976bb4b00326d465
parent fbaf6b353dc9b7218b340acf629b06ae8e0101bb
author Lorenzo Colitti <lorenzo@google.com> 1421993217 +0000
committer android-build-merger <android-build-merger@google.com> 1421993217 +0000

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

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