Robert Berry 67ed8bb785 Merge "Move recoverablekeystore package under services"

2017-12-13 11:32:42 +00:00

..

java

Merge "Move recoverablekeystore package under services"

2017-12-13 11:32:42 +00:00

jni

Merge "Enable fast drawing for solid color nine patch rectangles"

2017-12-11 21:14:44 +00:00

proto/android

Merge "incidentd: Updating field IDs and a field name."

2017-12-12 04:30:11 +00:00

res

Merge "Add config resource specifying WallpaperManagerService"

2017-12-13 06:59:37 +00:00

tests

Merge "Move recoverablekeystore package under services"

2017-12-13 11:32:42 +00:00