Ken Wakasa 4db998d65a am d8380fdb: Merge "resolved conflicts for merge of 8159336b to master" ...

* commit 'd8380fdba04d82566c623f1efbcb86aa33d9e401':
  Set the text bgcolor only when CursorAnchorInfo is available

2014-08-27 10:07:53 +00:00

..

res

am c1596086: resolved conflicts for merge of 0268f736 to master

2014-08-27 09:52:59 +00:00

src/com/android/inputmethod

resolved conflicts for merge of 8159336b to master

2014-08-27 18:55:39 +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

Remove unnecessary DebugSettingsActivity, use fragment directly

2014-07-23 17:09:46 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

…