Benedict Wong 16cec63d28 Merge "Force creation of Socket upon Transform application" am: 119cf2bc61 ...

am: abcf07af81

Change-Id: I2034448a22461d51728e66bcc0e965821aa4a42f

2018-04-04 12:52:00 -07:00

..

java

Merge "Force creation of Socket upon Transform application" am: 119cf2bc61

2018-04-04 12:52:00 -07:00

jni

Merge "Expose the JNI scrypt function in a standalone Java class so we can use it in RecoverableKeyStore as well" into pi-dev

2018-04-02 20:36:36 -07:00

proto

Based on the discussion of ag/3818243, this is the initial list. The

2018-04-03 10:31:09 -07:00

res

Merge "Update non-remote wallpaper anim to spec" into pi-dev

2018-04-04 06:12:28 -07:00

tests

Merge "Add settings to configure default multipath quota." into pi-dev

2018-04-03 20:17:22 -07:00