Alan Viverette 47172f5365 Merge "Use parseColor instead of getHTMLColor"

2014-11-21 20:40:08 +00:00

..

java

Merge "Use parseColor instead of getHTMLColor"

2014-11-21 20:40:08 +00:00

jni

Merge "Frameworks/base: Consistency in core/jni"

2014-11-21 18:18:36 +00:00

res

Import translations. DO NOT MERGE

2014-10-30 15:17:39 -07:00

tests

Fix for CharSequenceCreator test case

2014-11-07 12:27:28 +00:00