tree 0f9d8970556ed9709cebc6ab58120a0a1ef07294
parent 79c8d6bc0678b86b6dd41eb4d854bddc315fa244
parent 5f6b6bfb881601bdcb65c274449ffad08df5b29b
author Trevor Johns <tjohns@google.com> 1260496294 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260496294 -0800

am 5f6b6bfb: am 0359bdb7: Merge change I2b0bb983 into eclair

Merge commit '5f6b6bfb881601bdcb65c274449ffad08df5b29b' into eclair-mr2-plus-aosp

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