OSDN Git Service

am f9610b38: Merge "Make the DUN apn data secure." into froyo
authorRobert Greenwalt <robdroid@android.com>
Sun, 6 Jun 2010 19:10:00 +0000 (12:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 6 Jun 2010 19:10:00 +0000 (12:10 -0700)
Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into kraken

* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
  Make the DUN apn data secure.

1  2 
core/res/res/values/config.xml
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

Simple merge