summaryrefslogtreecommitdiffstats
path: root/vpn/java/android/net
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2009-11-24 09:45:09 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-24 09:45:09 -0800
commit0d2feb0d7355e6bb6235053a162aa8d6b770deeb (patch)
tree23b56dbecb4911f841efdb45271f74903b1f1882 /vpn/java/android/net
parentf5f38bec1a1c40fbe717f1aabe85e18e21c03810 (diff)
parent82d4b5ccaf5518ed9286d89e60ac9a595239ac35 (diff)
downloadframeworks_base-0d2feb0d7355e6bb6235053a162aa8d6b770deeb.zip
frameworks_base-0d2feb0d7355e6bb6235053a162aa8d6b770deeb.tar.gz
frameworks_base-0d2feb0d7355e6bb6235053a162aa8d6b770deeb.tar.bz2
am 82d4b5cc: am 99f7b56f: Merge change Iefdb6f97 into eclair
Merge commit '82d4b5ccaf5518ed9286d89e60ac9a595239ac35' into eclair-mr2-plus-aosp * commit '82d4b5ccaf5518ed9286d89e60ac9a595239ac35': Fixing minor doc typo in android.widget.SimpleCursorAdapter.
Diffstat (limited to 'vpn/java/android/net')
0 files changed, 0 insertions, 0 deletions