summaryrefslogtreecommitdiffstats
path: root/vpn/java/android/net
diff options
context:
space:
mode:
authorMike Cleron <mcleron@google.com>2009-10-01 11:34:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-01 11:34:19 -0700
commita60a1ef86911c9f2b9a4dbd87a804defca8b2a7c (patch)
treed72c827c0ac8527878579c640eb5af716a84b4cb /vpn/java/android/net
parent05bcbd6280e093a2a7d9fdceec603d35a83cc1e5 (diff)
parent03ecab425235bdb5e3548900284e8089c3d72e5e (diff)
downloadframeworks_base-a60a1ef86911c9f2b9a4dbd87a804defca8b2a7c.zip
frameworks_base-a60a1ef86911c9f2b9a4dbd87a804defca8b2a7c.tar.gz
frameworks_base-a60a1ef86911c9f2b9a4dbd87a804defca8b2a7c.tar.bz2
am 03ecab42: am 7957eaa6: Merge change Iee9b30d3 into eclair
Merge commit '03ecab425235bdb5e3548900284e8089c3d72e5e' * commit '03ecab425235bdb5e3548900284e8089c3d72e5e': New icons
Diffstat (limited to 'vpn/java/android/net')
0 files changed, 0 insertions, 0 deletions