OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c89073 d2f56f0)
am d2f56f07: am ac768973: am ce11881a: Allow VPN to stay connected for some time...
authorXia Wang <xiaw@google.com>
Sat, 5 Apr 2014 00:51:44 +0000 (00:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 5 Apr 2014 00:51:44 +0000 (00:51 +0000)
* commit 'd2f56f07f97e72e62c51b82454d06de1e7b929a8':
  Allow VPN to stay connected for some time before disconnecting it.


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help