Yohei Yukawa 00042cb453 am c925ca43: am 97681ebd: Set highlight color along with the commit indicator ... * commit 'c925ca43a6e0b3175feb002ce6b5577ef7d66507': Set highlight color along with the commit indicator		2014-08-27 10:01:24 +00:00
..
res	resolved conflicts for merge of 0268f736 to master	2014-08-27 18:41:31 +09:00
src/com/android/inputmethod	am c925ca43: am 97681ebd: Set highlight color along with the commit indicator	2014-08-27 10:01:24 +00: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	Remove unnecessary DebugSettingsActivity, use fragment directly	2014-07-23 17:09:46 -07:00
MODULE_LICENSE_APACHE2	…
NOTICE	…
proguard.flags	Use Java 7 diamond operator	2014-05-24 01:05:42 +09:00