OSDN Git Service

Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
authorRobert Greenwalt <rgreenwalt@google.com>
Wed, 4 May 2011 16:59:30 +0000 (09:59 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 4 May 2011 16:59:30 +0000 (09:59 -0700)
commitf13eb8301f4704179938e374129f2943c9c38d5f
tree028311ba07490cd91380100b180a47e26f79a5fb
parent36132a488b2974db9a90da809c2f3eeab99a4427
parentf2102f7a1a26d399cc60c516ed7d90ef660de055
Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
core/res/res/values/config.xml
services/java/com/android/server/ConnectivityService.java