tree f8b3f446a7c4bdfe1b470ae1f6d5c12314116a45
parent b203a57d1f00fe509e0d065cd928099bb7d19d87
parent 1f1602e7291ab2b4d8d76db33c89828b6e58e6c0
author Android (Google) Code Review <android-gerrit@google.com> 1248957967 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1248957967 -0700

Merge change 9145 into donut

* changes:
  Add the encryption option to PptpProfile parcel.