OSDN Git Service

am 5f6b6bfb: am 0359bdb7: Merge change I2b0bb983 into eclair
authorTrevor Johns <tjohns@google.com>
Fri, 11 Dec 2009 01:51:34 +0000 (17:51 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 01:51:34 +0000 (17:51 -0800)
Merge commit '5f6b6bfb881601bdcb65c274449ffad08df5b29b' into eclair-mr2-plus-aosp

* commit '5f6b6bfb881601bdcb65c274449ffad08df5b29b':
  Importing Wikitionary/SimpleWiktionary sample code from http://code.google.com/p/wiktionary-android/.


Trivial merge