summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:43:55 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:43:55 -0800
commit7643a1fcce0798ff46f485759f4527e5c8067ba7 (patch)
tree195e76d8525df942743c735a1297427ae49c6d18
parentd9514070f3357bed9a984b2bc36b39ac19978ae1 (diff)
parentbff01c69cb84d9bf444edfb181b32b0240893aac (diff)
downloadPinyinIME-7643a1fcce0798ff46f485759f4527e5c8067ba7.tar.gz
am bff01c69: reconcile main tree with open-source eclair
Merge commit 'bff01c69cb84d9bf444edfb181b32b0240893aac' into eclair-plus-aosp * commit 'bff01c69cb84d9bf444edfb181b32b0240893aac': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions