OSDN Git Service

Merge change 9142 into donut
authorAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 30 Jul 2009 12:23:06 +0000 (05:23 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 30 Jul 2009 12:23:06 +0000 (05:23 -0700)
commit9c432349a79cd0f19ebdee18deb2b0b8550d661f
tree9e9564c5eb6cb4ec9345c7d7380e421cd16042a6
parentc538b651a23287ab25584995c6c4b7a68ece027c
parent7be218e7f7bb57049d9e3586cbd65cfc8f218f9d
Merge change 9142 into donut

* changes:
  Add encryption option to PPTP UI.