summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:46:33 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:46:33 -0800
commitfb0447e72c641b2f81e39d2a238e289cf9f26825 (patch)
tree93acbe895e1f510617f547cbb401d1271ec39307
parent102f6a912ff2c9ba9b94c6d0b0c213f5c0a4121d (diff)
parentf934e0dc443c844e96535b9fa8cb0bee63f4ca5d (diff)
downloadIM-fb0447e72c641b2f81e39d2a238e289cf9f26825.tar.gz
am f934e0dc: reconcile main tree with open-source eclair
Merge commit 'f934e0dc443c844e96535b9fa8cb0bee63f4ca5d' into eclair-plus-aosp * commit 'f934e0dc443c844e96535b9fa8cb0bee63f4ca5d': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions