summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 14:24:40 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 14:24:40 -0800
commitb9a978bab60578e1fbdad4e3ff244f7663f2df94 (patch)
tree7895fd7d4e1c2d47424860b91f92700fe6e1a011
parent08a240807110c8e115ec5085ee615e2c24ecf6fa (diff)
parentb176f8cb88ad268c1faf33ef38964fbbdd3ace6f (diff)
downloadyaffs2-b9a978bab60578e1fbdad4e3ff244f7663f2df94.tar.gz
am b176f8cb: am 05aaabf9: reconcile main tree with open-source eclair
Merge commit 'b176f8cb88ad268c1faf33ef38964fbbdd3ace6f' * commit 'b176f8cb88ad268c1faf33ef38964fbbdd3ace6f': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions