Elliott Hughes 7c4ef052d5 Merge "Fix for CharSequenceCreator test case"

2014-11-12 01:38:58 +00:00

..

java

am b0cb0734: Merge "Track change to Conscrypt"

2014-11-03 18:40:55 +00:00

jni

Merge "Frameworks/base: Fix FingerprintManager JNI"

2014-11-11 23:47:53 +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