summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:40:23 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:40:23 -0800
commitca78777a885b641897345cf52fcd9c8ffee1be1b (patch)
treeceac19c9690998c40962a8dd9fc330a64743f685
parentf9fe44bacb595a7df98f95eb68b38f8d03d6def9 (diff)
parent0a00f0b5c02b774248143c24b7d596db139de4bf (diff)
downloadlibcore-ca78777a885b641897345cf52fcd9c8ffee1be1b.zip
libcore-ca78777a885b641897345cf52fcd9c8ffee1be1b.tar.gz
libcore-ca78777a885b641897345cf52fcd9c8ffee1be1b.tar.bz2
am 217f8ef4: reconcile main tree with open-source eclair
Merge commit '217f8ef4c1c151c63382dc0785edd960c233f62e' into eclair-plus-aosp * commit '217f8ef4c1c151c63382dc0785edd960c233f62e': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions