OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 May 2010 16:12:47 +0000 (09:12 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 May 2010 16:12:47 +0000 (09:12 -0700)
commit4811287623e6cbd9a3584828087ea414454dbfc5
tree5026162177e2753ee9c28981c57d5b727c272f19
parent50c7f2d92a8100982c49027058fb05069e4a1e2a
parent3514cdc3b0f88127c418609e29fbb04abb6174cc
merge from open-source master

Change-Id: Id9c258165d9bb326271218a562d782fa52608213
src/com/android/settings/ApplicationSettings.java
src/com/android/settings/vpn/VpnSettings.java