Adrian Roos 5304e89dfd Merge "KeyguardManager: Fix user resolution of isDeviceSecure/Locked"

2017-01-23 22:21:07 +00:00

..

java

Merge "KeyguardManager: Fix user resolution of isDeviceSecure/Locked"

2017-01-23 22:21:07 +00:00

jni

Merge "Expose fonts.xml via public API with a service"

2017-01-23 19:57:23 +00:00

proto/android

Add ability to dump settings as proto buf

2017-01-22 15:25:22 -08:00

res

Merge "Port RecyclerView to com.android.internal.widget.RecyclerView"

2017-01-23 20:38:42 +00:00

tests

Add ResolverActivity testing

2017-01-23 10:43:03 -08:00