summaryrefslogtreecommitdiffstats
path: root/vpn
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2009-11-09 11:55:25 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-09 11:55:25 -0800
commit5af08d5ec3d382e58604e62762be79fef79cbd9c (patch)
tree78db52b5a731c101c16335e83628a9523ad98984 /vpn
parent86d74ba98a9cf302e1471b417d7822ca82ae1534 (diff)
parent5dc4fb08493aa9cf34dc81283c850b9b6a998ce8 (diff)
downloadframeworks_native-5af08d5ec3d382e58604e62762be79fef79cbd9c.zip
frameworks_native-5af08d5ec3d382e58604e62762be79fef79cbd9c.tar.gz
frameworks_native-5af08d5ec3d382e58604e62762be79fef79cbd9c.tar.bz2
am 93572eef: Merge change Ifb9d6df3 into eclair
Merge commit '93572eef41f94f023037482f194db0ab07d0c33a' into eclair-plus-aosp * commit '93572eef41f94f023037482f194db0ab07d0c33a': More log for issue 2242381.
Diffstat (limited to 'vpn')
0 files changed, 0 insertions, 0 deletions