summaryrefslogtreecommitdiffstats
path: root/simulator
diff options
context:
space:
mode:
authorMegha Joshi <mjoshi@google.com>2010-02-03 12:34:37 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-03 12:34:37 -0800
commit64908722b97c2890b84f51ddfcd7b79befe0a9fb (patch)
tree53acb0dd008fd0b1f67d8ebb4274c58add58fd41 /simulator
parente12d66063b78921eb1b1f1c302cc1c4219a5fb6e (diff)
parent74ccbf7aa77213d6df41990936d5f30eb06afe43 (diff)
downloadandroid_development-64908722b97c2890b84f51ddfcd7b79befe0a9fb.tar.gz
android_development-64908722b97c2890b84f51ddfcd7b79befe0a9fb.tar.bz2
android_development-64908722b97c2890b84f51ddfcd7b79befe0a9fb.zip
am 74ccbf7a: am ca7a9d34: Merge "SampleSyncAdapter sample code." into eclair
Merge commit '74ccbf7aa77213d6df41990936d5f30eb06afe43' * commit '74ccbf7aa77213d6df41990936d5f30eb06afe43': SampleSyncAdapter sample code.
Diffstat (limited to 'simulator')
0 files changed, 0 insertions, 0 deletions