aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:42:14 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:42:14 -0800
commitc1b13cb5660d2e83261412e7852202cf1e2ead77 (patch)
tree423de0ff05485832b9b334e00c3c115a7d714222
parent1bc3d5a1ac3379353829289ee69ef706bc9e0b0b (diff)
parentb6687b3c061a812fad2a9773ab8f3e957f480d3d (diff)
downloadicu4c-c1b13cb5660d2e83261412e7852202cf1e2ead77.tar.gz
am b6687b3c: reconcile main tree with open-source eclair
Merge commit 'b6687b3c061a812fad2a9773ab8f3e957f480d3d' into eclair-plus-aosp * commit 'b6687b3c061a812fad2a9773ab8f3e957f480d3d': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions