summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 14:11:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 14:11:42 -0800
commitbae6e6fddb97f90cb1d71e748d5507f694356135 (patch)
treee040480b6f414874813b1bcbb4653c7003f8fef4
parent6ac94e9eb27717b1e282298172ebabb524de7058 (diff)
parent7643a1fcce0798ff46f485759f4527e5c8067ba7 (diff)
downloadPinyinIME-bae6e6fddb97f90cb1d71e748d5507f694356135.tar.gz
am 7643a1fc: am bff01c69: reconcile main tree with open-source eclair
Merge commit '7643a1fcce0798ff46f485759f4527e5c8067ba7' * commit '7643a1fcce0798ff46f485759f4527e5c8067ba7': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions