diff options
| author |   satok <satok@google.com> | 2011-06-27 22:47:11 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-06-27 22:47:11 +0900 |
| commit | b2d1967e1c8f1de6ad330bfa04bf1de6ef4068a0 (patch) | |
| tree | 008facdde4b33a66a867811e7db1199b8f9eb302 /java/src/com/android/inputmethod/compat/LinearLayoutCompatUtils.java | |
| parent | 387293ddf57089992b0535b7ac8a76b5ed7eb315 (diff) | |
| parent | 8aee75926267ccfd55eeaf251849d1ead27cf36d (diff) | |
| download | latinime-b2d1967e1c8f1de6ad330bfa04bf1de6ef4068a0.tar.gz latinime-b2d1967e1c8f1de6ad330bfa04bf1de6ef4068a0.tar.xz latinime-b2d1967e1c8f1de6ad330bfa04bf1de6ef4068a0.zip | |
Merge remote-tracking branch 'goog/master' into HEAD
Conflicts:
java/res/values/keyboard-icons-ics.xml
Change-Id: I8b9b0758a81efd984cc9af52280ef75a807cd991
Diffstat (limited to 'java/src/com/android/inputmethod/compat/LinearLayoutCompatUtils.java')
0 files changed, 0 insertions, 0 deletions