Yohei Yukawa 2297d22659 am d1f629f3: am 42be51bd: Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-dev automerge: 50ef3d9 ...

* commit 'd1f629f36ba35d86e37732a145aad771f9e6b23c':
  Minimize the number of default enabled IMEs part 4

2014-11-07 03:56:14 +00:00

..

java

am d1f629f3: am 42be51bd: Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-dev automerge: 50ef3d9

2014-11-07 03:56:14 +00:00

jni

resolved conflicts for merge of be70c771 to master

2014-11-06 13:04:49 -08:00

res

am df7ba463: am c6c5c7d6: am efec89f2: am 1d6d4272: Adding wallpaper animations

2014-11-07 03:55:24 +00:00

tests

am 42be51bd: Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-dev automerge: 50ef3d9

2014-11-07 00:09:50 +00:00