OSDN Git Service

am d1e93240: (-s ours) am 64e1e15d: Merge "Restore Vpn advanced options on re-init...
authorRobin Lee <rgl@google.com>
Thu, 27 Aug 2015 11:31:17 +0000 (11:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:31:17 +0000 (11:31 +0000)
commit6d557943277e3eac5b65be3f8d50ff5b0b1450e1
tree7f84c40aaa75cd61f165f55c1ed04452351a1edd
parent62b24c74a9579dc9e76f4de268084ebbffe5f0fd
parentd1e93240aadca200462de351415abed5e856b58c
am d1e93240: (-s ours) am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev

* commit 'd1e93240aadca200462de351415abed5e856b58c':