summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-08-01Merge commit 'android-cts-4.1_r1' into HEADM8930AAAAANLYA2214013jb-8930-master-dsdaJessica Gonzalez0-0/+0
2012-04-03Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood0-0/+0
2011-10-28keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl0-0/+0
2011-10-26undo reset to ics-mr1 until we have a better methodEd Heyl0-0/+0
2011-10-26reset to ics-mr1, but keep historyEd Heyl0-0/+0
2011-10-24Upgrade to openbsd's netcat.Nick Kralevich36-5242/+1236
2011-07-11Remove the simulator target from all makefiles.R8625SSNSKQLYA1135R8625SSNSKQLYA1130R8625SSNSKQLYA1120R8625SSNSKQLYA1110ics_master_qrd_dsda_fcics_master_qrd_dsda_csJeff Brown1-4/+0
2010-09-26am 3b923003: Avoid calling res_init() since it\'s a private API in bionicJim Huang1-0/+2
2010-09-23Avoid calling res_init() since it's a private API in bionicJim Huang1-0/+2
2010-05-17Get rid of warnings when compiled with -Wformat-securityNick Kralevich1-1/+1
2010-03-08Add an empty CleanSpec.mkJean-Baptiste Queru1-0/+49
2010-02-05reconcile main tree with open-source eclairThe Android Open Source Project0-0/+0
2010-01-29reconcile android-2.1_r1 snapshotThe Android Open Source Project0-0/+0
2010-01-12android-2.1_r1 snapshotThe Android Open Source Project0-0/+0
2009-07-26reconcile korg/master into goog/masterJean-Baptiste Queru0-0/+0
2009-07-25Merge korg/donut into korg/masterJean-Baptiste Queru0-0/+0
2009-04-22Merge donut into masterJean-Baptiste Queru0-0/+0
2009-04-22merge cupcake into donutJean-Baptiste Queru0-0/+0
2009-04-22Merge donut into masterJean-Baptiste Queru0-0/+0
2009-03-29Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project0-0/+0
2009-03-27Merge commit 'korg/cupcake'The Android Open Source Project1-0/+8
2009-03-24Automated import from //branches/donutburger/...@140818,140818Dianne Hackborn1-0/+8
2009-03-24Automated import from //branches/master/...@140824,140824Dianne Hackborn1-0/+8
2009-03-19auto import from //branches/cupcake_rel/...@141571The Android Open Source Project1-0/+8
2009-03-18Merge commit 'remotes/korg/cupcake' into cupcake_to_masterJean-Baptiste Queru2-5/+10
2009-03-09auto import from //branches/cupcake/...@137197The Android Open Source Project1-1/+1
2009-03-05auto import from //depot/cupcake/@136594The Android Open Source Project1-2/+2
2009-03-03auto import from //depot/cupcake/@135843The Android Open Source Project34-0/+5293
2009-03-03auto import from //depot/cupcake/@135843The Android Open Source Project34-5293/+0
2009-02-10auto import from //branches/cupcake/...@130745The Android Open Source Project1-2/+7
2008-12-17Code drop from //branches/cupcake/...@124589The Android Open Source Project0-0/+0
2008-10-21Initial ContributionThe Android Open Source Project6-1/+26
1970-01-12external/netcat 110Upstream31-0/+5263