Andreas Gampe db38706603 Merge "Frameworks/base: Fix FingerprintManager JNI"

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

am dfcf0655: am 09fd5a18: Merge "Replacing FloatMath native implementation with calls to Math"

2014-10-20 10:16:08 +00:00