diff options
| author |   satok <satok@google.com> | 2010-09-07 22:37:39 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2010-09-07 22:37:39 +0900 |
| commit | eca96373907ccd704412c3ee6e46260717861dde (patch) | |
| tree | 51eaaf4bd30fd52c42b2f7c1fee02eff470b099e /java/src/com/android/inputmethod/voice/RecognitionView.java | |
| parent | 73540126a8ad99cc368d707a02cc02df3d8d3b1c (diff) | |
| parent | c7e1642610301f8a325270a10fdc8e7ecbd48acf (diff) | |
| download | latinime-eca96373907ccd704412c3ee6e46260717861dde.tar.gz latinime-eca96373907ccd704412c3ee6e46260717861dde.tar.xz latinime-eca96373907ccd704412c3ee6e46260717861dde.zip | |
Merge remote branch 'goog/master' into merge4
Conflicts:
java/res/values/strings.xml
Change-Id: Iee1abd3c11e07f681b9f7a280c3621a0c33ffc90
Diffstat (limited to 'java/src/com/android/inputmethod/voice/RecognitionView.java')
0 files changed, 0 insertions, 0 deletions