diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-11-18 09:15:36 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-11-18 09:15:36 -0800 |
| commit | ea953fd555569202668ecaa69e2b8630f88f85ed (patch) | |
| tree | b75e3ebaccd5ae1a6513ad0fee3efec2e75496fc /java/src/com/android/inputmethod/compat/ArraysCompatUtils.java | |
| parent | a25c8e69c2fac73905bdd0d5bf38ee9943786634 (diff) | |
| parent | 49cc3beb75e2916037a0f8ff2d2795f306918598 (diff) | |
| download | latinime-ea953fd555569202668ecaa69e2b8630f88f85ed.tar.gz latinime-ea953fd555569202668ecaa69e2b8630f88f85ed.tar.xz latinime-ea953fd555569202668ecaa69e2b8630f88f85ed.zip | |
am 49cc3beb: resolved conflicts for merge of 137667ed to master
* commit '49cc3beb75e2916037a0f8ff2d2795f306918598':
Ignore microphone and settings key while typing
Diffstat (limited to 'java/src/com/android/inputmethod/compat/ArraysCompatUtils.java')
0 files changed, 0 insertions, 0 deletions