diff options
| author |   satok <satok@google.com> | 2011-06-24 18:38:41 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-06-24 18:38:41 +0900 |
| commit | 80a9ce76d85ff521aeb5a51d759f5ba367ffc627 (patch) | |
| tree | 239ff93af9a2b5bb0271968467a212c150608e03 /java/src/com/android/inputmethod/deprecated/voice/Hints.java | |
| parent | dfd66f19edf1e1d97a0bf83dd20b99ee8bfae35e (diff) | |
| parent | 52344a0788db20d12960b2481e99e990c3de1ea4 (diff) | |
| download | latinime-80a9ce76d85ff521aeb5a51d759f5ba367ffc627.tar.gz latinime-80a9ce76d85ff521aeb5a51d759f5ba367ffc627.tar.xz latinime-80a9ce76d85ff521aeb5a51d759f5ba367ffc627.zip | |
Merge remote-tracking branch 'goog/master' into merge
Conflicts:
java/res/xml/method.xml
Change-Id: I7b5f2232753d7159b520e5e57a0e06c51935edbd
Diffstat (limited to 'java/src/com/android/inputmethod/deprecated/voice/Hints.java')
| -rw-r--r-- | java/src/com/android/inputmethod/deprecated/voice/Hints.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/deprecated/voice/Hints.java b/java/src/com/android/inputmethod/deprecated/voice/Hints.java index 52a4f4e58..06b234381 100644 --- a/java/src/com/android/inputmethod/deprecated/voice/Hints.java +++ b/java/src/com/android/inputmethod/deprecated/voice/Hints.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Google Inc. + * Copyright (C) 2009 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of |