summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-01-28 12:37:10 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-28 12:37:10 -0800
commitcf5769877be79d571c9110a51d1591fb47cdce18 (patch)
tree781d17d845fffb0ce8dd324625fe68c1bbcdbd86 /include
parent2c36081131aa8dbd856d2365c13b1325a145d787 (diff)
parent43d5a09f4626d6cc865b7ef138a1cd828363b8f8 (diff)
downloadframeworks_base-cf5769877be79d571c9110a51d1591fb47cdce18.zip
frameworks_base-cf5769877be79d571c9110a51d1591fb47cdce18.tar.gz
frameworks_base-cf5769877be79d571c9110a51d1591fb47cdce18.tar.bz2
am 43d5a09f: am c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair
Merge commit '43d5a09f4626d6cc865b7ef138a1cd828363b8f8' * commit '43d5a09f4626d6cc865b7ef138a1cd828363b8f8': SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions