Fyodor Kupolov 30f3e957d3 Merge "Fix reading exception from Parcel" into pi-dev ...

am: e269a5ac62

Change-Id: I3c4ee53e8f1e96f58034ac89e7f4bb65dd549120

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

..

java

Merge "Fix reading exception from Parcel" into pi-dev

2018-04-04 12:28:29 -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