OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b89c4d7 8361a97)
am 8361a97c: am 3e238230: am 836eff87: Merge "Add legacy VPN test framework and test...
authorXia Wang <xiaw@google.com>
Wed, 2 Apr 2014 03:51:38 +0000 (03:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Apr 2014 03:51:38 +0000 (03:51 +0000)
* commit '8361a97c43a49b5e7528afd5baeca624d909bbf9':
  Add legacy VPN test framework and test cases


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