tree 78b75d152da5ad6c9044cbd893eb3f9aba14f7d7
parent 59b82c3eae2cd329461b7ad64bd8abee4898a90e
parent 90e96db0b5a200f528f1ca6a66d5aeaa5c915ca2
author Vinod Krishnan <vinodkrishnan@google.com> 1402013800 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402013800 +0000

am 90e96db0: Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev

* commit '90e96db0b5a200f528f1ca6a66d5aeaa5c915ca2':
  Adding a way to stub Vpn ConfirmDialog