OSDN Git Service

am ddedf966: am 5f6b6bfb: am 0359bdb7: Merge change I2b0bb983 into eclair
authorTrevor Johns <tjohns@google.com>
Fri, 11 Dec 2009 07:41:21 +0000 (23:41 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 07:41:21 +0000 (23:41 -0800)
Merge commit 'ddedf9666e90cfac79c1b31ff2beaef4ad60366c'

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


Trivial merge