Commits

Author Commit Message Labels Comments Date
Ying Wang
Build target bzip2 against the NDK.
Nick Kralevich
am 879585bb: (-s ours) am 701ad7cc: (-s ours) DO NOT MERGE cherry-picked 172b266ed7845eac2edc7e7f8a72371356a9a277 from master
Nick Kralevich
am 701ad7cc: (-s ours) DO NOT MERGE cherry-picked 172b266ed7845eac2edc7e7f8a72371356a9a277 from master
Nick Kralevich
DO NOT MERGE cherry-picked 172b266ed7845eac2edc7e7f8a72371356a9a277 from master
Nick Kralevich
upgrade to 1.0.6
The Android Open Source Project
add meta-files about 3rd party projects
Jean-Baptiste Queru
Add an empty CleanSpec.mk
The Android Open Source Project
reconcile main tree with open-source eclair
The Android Open Source Project
reconcile android-2.1_r1 snapshot
The Android Open Source Project
android-2.1_r1 snapshot
Jean-Baptiste Queru
reconcile korg/master into goog/master
Jean-Baptiste Queru
Merge korg/donut into korg/master
Jean-Baptiste Queru
Merge donut into master
Jean-Baptiste Queru
merge cupcake into donut
Jean-Baptiste Queru
Merge donut into master
The Android Open Source Project
Merge branch 'open_source_no_contributions' into google_internal
The Android Open Source Project
Merge commit 'korg/cupcake'
Dianne Hackborn <>
Automated import from //branches/donutburger/...@140818,140818
Dianne Hackborn <>
Automated import from //branches/master/...@140824,140824
The Android Open Source Project
auto import from //branches/cupcake_rel/...@141571
Jean-Baptiste Queru
Merge commit 'remotes/korg/cupcake' into cupcake_to_master
The Android Open Source Project
auto import from //depot/cupcake/@135843
The Android Open Source Project
auto import from //depot/cupcake/@135843
The Android Open Source Project
Code drop from //branches/cupcake/...@124589