Ken Wakasa 6f8f45f000 am 64176158: resolved conflicts for merge of 75513e51 to master ...

* commit '64176158e7ce9c99365d20433c81012ea7e36729':
  Fix not always showing input view with physical keyboard connected

2014-09-13 01:58:30 +00:00

..

res

am d190b8c5: am c24340f9: am 74d59cca: am dc1097ee: Merge "Update AOSP launcher icon" into lmp-dev

2014-09-12 19:46:36 +00:00

src/com/android/inputmethod

resolved conflicts for merge of 75513e51 to master

2014-09-13 10:41:19 +09:00

Android.mk

DO NOT MERGE: Abolish source code overlay and introduce overridable src dir

2014-08-20 02:56:09 +00:00

AndroidManifest.xml

Clear keyboard cache when system locale is changed

2014-08-28 22:50:07 +09:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

…