aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2014-08-27 10:07:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-27 10:07:53 +0000
commit4db998d65aed92a7ea8727702a8bd9ca427ed97c (patch)
tree39b82fc7c49275739bac033430a652317f697e83 /java/res
parent2b06811843fb88763433819ded4b99470e3019fa (diff)
parentd8380fdba04d82566c623f1efbcb86aa33d9e401 (diff)
downloadlatinime-4db998d65aed92a7ea8727702a8bd9ca427ed97c.tar.gz
latinime-4db998d65aed92a7ea8727702a8bd9ca427ed97c.tar.xz
latinime-4db998d65aed92a7ea8727702a8bd9ca427ed97c.zip
am d8380fdb: Merge "resolved conflicts for merge of 8159336b to master"
* commit 'd8380fdba04d82566c623f1efbcb86aa33d9e401': Set the text bgcolor only when CursorAnchorInfo is available
Diffstat (limited to 'java/res')
0 files changed, 0 insertions, 0 deletions