Satoshi Kataoka 7b4703402e am 83994ad6: Merge "Fix the security related API change for PreferenceActivity" ...

* commit '83994ad66b337276c8ba18249a1c5d52540eeef3':
  Fix the security related API change for PreferenceActivity

2013-10-08 22:50:13 -07:00

..

res

Merge "Import translations. DO NOT MERGE"

2013-10-08 14:03:32 +00:00

src/com/android/inputmethod

Merge "Fix the security related API change for PreferenceActivity"

2013-10-09 05:46:15 +00:00

Android.mk

…

AndroidManifest.xml

Try decaying user history at hourly intervals.

2013-10-02 18:06:08 +09:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

Follow-up to I97df1c3d4076fe97657ebc3b086cccd2b97e9a9a

2013-06-26 18:09:34 +09:00