tree 559b3c2bb429eaf38cbdf28cbd09907f63b90497
parent dee68663724c7117a51eb3af3d9390e00af832f5
parent 5d6d417972f8d946c223c4efb9636b1ba4280543
author Android (Google) Code Review <android-gerrit@google.com> 1242409462 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1242409462 -0700

Merge change 1694 into donut

* changes:
  nexus: Flesh out VPN support a bit more, cleanup service handling