Chia-chi Yeh 880f64ac10 Merge "VPN: introduce VpnService as the base class for user space VPN."

2011-08-08 11:33:57 -07:00

..

com/android/server

Merge "VPN: introduce VpnService as the base class for user space VPN."

2011-08-08 11:33:57 -07:00

Android.mk

disable emma instrumentation for framework, ext and services (DO NOT MERGE)

2010-05-18 16:02:28 -07:00