OSDN Git Service

am 0359bdb7: Merge change I2b0bb983 into eclair
authorTrevor Johns <tjohns@google.com>
Fri, 11 Dec 2009 01:44:35 +0000 (17:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 01:44:35 +0000 (17:44 -0800)
commit5f6b6bfb881601bdcb65c274449ffad08df5b29b
treee02e4bc90f4918049a9d5818c4b4af6b89f8164c
parent04df8565bf8f2b81a632fcd736cb96c8da478b9e
parent0359bdb72f3da3f319d0b3ef87a70c4f98d4154f
am 0359bdb7: Merge change I2b0bb983 into eclair

Merge commit '0359bdb72f3da3f319d0b3ef87a70c4f98d4154f' into eclair-mr2

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