summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/VpnService.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-09-30 15:52:46 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-30 15:52:47 -0700
commit2a30547af44536f6b0e2f7020ac1a435c72afc84 (patch)
tree51b7e3d767df429fed33315471b70ad6b0c277bb /core/java/android/net/VpnService.java
parent2b58c1b503334ea20be9de3c2b5654855f9d4669 (diff)
parentfe37f8f51d90fc4c6230e54dcd1270df5fcc6be3 (diff)
downloadframeworks_base-2a30547af44536f6b0e2f7020ac1a435c72afc84.zip
frameworks_base-2a30547af44536f6b0e2f7020ac1a435c72afc84.tar.gz
frameworks_base-2a30547af44536f6b0e2f7020ac1a435c72afc84.tar.bz2
Merge "Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev
Diffstat (limited to 'core/java/android/net/VpnService.java')
0 files changed, 0 insertions, 0 deletions