summaryrefslogtreecommitdiffstats
path: root/vpn
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-10-18 09:31:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-18 09:31:09 -0700
commit5bb9e621e16278080ce697a8c958927d51e5ebf6 (patch)
treeafc6505713cbed988f98db8f4f126d6e2d67a8c1 /vpn
parent246d8b7d154a257676e83257c1425b8ef9ba2574 (diff)
parent20856f71d971a85a25307941055fb9543adcdc68 (diff)
downloadframeworks_base-5bb9e621e16278080ce697a8c958927d51e5ebf6.zip
frameworks_base-5bb9e621e16278080ce697a8c958927d51e5ebf6.tar.gz
frameworks_base-5bb9e621e16278080ce697a8c958927d51e5ebf6.tar.bz2
am 20856f71: am c9f7890a: Revise some javadocs for NFC; add package description
Merge commit '20856f71d971a85a25307941055fb9543adcdc68' * commit '20856f71d971a85a25307941055fb9543adcdc68': Revise some javadocs for NFC; add package description
Diffstat (limited to 'vpn')
0 files changed, 0 insertions, 0 deletions