Alex Klyubin b1aa7d0bc8 am 51884f0e: am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant." ...

* commit '51884f0e066bcf1ba5e039cd8a24a87139b5a01c':
  Add Keymaster KM_ORIGIN_UNKNOWN constant.

2015-04-16 20:20:15 +00:00

..

java

am 499126c4: Merge "Add Keymaster KM_ORIGIN_UNKNOWN constant."

2015-04-16 20:09:05 +00:00

jni

Merge "Load libraries directly from apk"

2015-04-07 17:28:15 +00:00

res

Import translations. DO NOT MERGE

2015-04-15 07:28:29 -07:00

tests

Add android.net.IpPrefix#contains()

2015-04-14 16:19:11 +09:00