tree 6c92f90a58f79726d1feecd84ffcc4eaa36980db
parent 2ac8c279881a6a12f979f54954cab69c98ba9d98
parent c22e0c8012828474e8aa2e29b441ef02728b0842
author Hung-ying Tyan <tyanh@google.com> 1250039527 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1250039527 -0700

am c22e0c80: Merge change 20719 into donut

Merge commit 'c22e0c8012828474e8aa2e29b441ef02728b0842'

* commit 'c22e0c8012828474e8aa2e29b441ef02728b0842':
  Fix order of setting/saving state in VpnService.