Kenny Root d00ced983e am b0cb0734: Merge "Track change to Conscrypt" ...

* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
  Track change to Conscrypt

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

..

java

am b0cb0734: Merge "Track change to Conscrypt"

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

jni

am e5fe7f3f: Merge "Fix android_media_AudioSystem_getMasterMute return type."

2014-10-29 21:57:16 +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