summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-12-15 17:44:00 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-15 17:44:00 -0800
commita9099eeb241c8785b777ad9ce3548ec026e8b073 (patch)
tree8823e68c89a5df1cfeb5c6fb10ae64b28106d4e9 /core/java/android/net
parent826350cdc73e9415defb0797310b51ba50d381e5 (diff)
parent6bbd38e98615d6a2d4d4e1401a9316bfe7736486 (diff)
downloadframeworks_base-a9099eeb241c8785b777ad9ce3548ec026e8b073.zip
frameworks_base-a9099eeb241c8785b777ad9ce3548ec026e8b073.tar.gz
frameworks_base-a9099eeb241c8785b777ad9ce3548ec026e8b073.tar.bz2
am 6bbd38e9: am aeb06e34: am 6fbddffc: Merge "Minor tweaks to Sharing class, updated some typos, wording and a screenshot." into ics-mr0
* commit '6bbd38e98615d6a2d4d4e1401a9316bfe7736486': Minor tweaks to Sharing class, updated some typos, wording and a screenshot.
Diffstat (limited to 'core/java/android/net')
0 files changed, 0 insertions, 0 deletions