diff options
| author |   Ying Wang <wangying@google.com> | 2014-06-11 19:34:21 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-06-11 19:34:21 +0000 |
| commit | 87c056edf179715d268b40ddcec4986a03ee7f08 (patch) | |
| tree | f6040806bf67719e0d18ba38939dfc6716c02e4a /java/src/com/android/inputmethod/latin/InputView.java | |
| parent | 4dab3a4e766a7a2eb4977551e37f910733bcc27c (diff) | |
| parent | c49c9c52bec44303923001af554c160a4117d071 (diff) | |
| download | latinime-87c056edf179715d268b40ddcec4986a03ee7f08.tar.gz latinime-87c056edf179715d268b40ddcec4986a03ee7f08.tar.xz latinime-87c056edf179715d268b40ddcec4986a03ee7f08.zip | |
am c49c9c52: resolved conflicts for merge of 90b948ea to master
* commit 'c49c9c52bec44303923001af554c160a4117d071':
Use LOCAL_MULTILIB to build host lib as 64-bit
Diffstat (limited to 'java/src/com/android/inputmethod/latin/InputView.java')
0 files changed, 0 insertions, 0 deletions