summaryrefslogtreecommitdiffstats
path: root/vpn/java/android
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2009-06-24 18:31:21 -0700
committerMathias Agopian <mathias@google.com>2009-06-24 18:31:21 -0700
commit4c4b387afb2e775fcac3b81a249bb7646515dffa (patch)
tree893af3f7521ad4aa204449dc58132b21177e41fb /vpn/java/android
parent2e123245811a1f31c080a29728fcc1655045f011 (diff)
parent6ebed6600464d507a651d99792baa3a23a4f0766 (diff)
downloadframeworks_native-4c4b387afb2e775fcac3b81a249bb7646515dffa.zip
frameworks_native-4c4b387afb2e775fcac3b81a249bb7646515dffa.tar.gz
frameworks_native-4c4b387afb2e775fcac3b81a249bb7646515dffa.tar.bz2
merge master in master_gl
Diffstat (limited to 'vpn/java/android')
0 files changed, 0 insertions, 0 deletions