Remi NGUYEN VAN f0e3b091f8 Merge "Fix android.net.SSLTest" am: ef43ea3238 ...

am: 60b828ca86

Change-Id: I482bd9734f62ba1554e0d7e0bf889b23450303ee

2018-05-09 19:31:38 -07:00

..

java

Merge "Fix android.net.SSLTest" am: ef43ea3238

2018-05-09 19:31:38 -07:00

jni

Merge "Allow ImageDecoder to read SkFILEStream directly" into pi-dev

2018-05-09 15:59:50 -07:00

proto

Merge "Show "in parole?" in dumpsys jobscheduler" into pi-dev

2018-05-08 18:09:56 +00:00

res

Merge "Adds overlay field for Swipe Up gesture's default opt-in value" into pi-dev

2018-05-09 17:50:32 -07:00

tests

Merge "Fix android.net.SSLTest" am: ef43ea3238

2018-05-09 19:31:38 -07:00