Benedict Wong 9c6f24d1ee Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am: b6df7f0d35 am: d3a5792024 ...

am: f92bfc3b77

Change-Id: I49932a5fc048b4a60512fac45a3537f050397168

2017-10-19 17:37:22 +00:00

..

java/com/android/server

Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am: b6df7f0d35 am: d3a5792024

2017-10-19 17:37:22 +00:00

jni

Merge "Add crash recovery logic to HardwarePropertiesManagerService" into oc-mr1-dev

2017-10-18 18:09:08 +00:00

Android.mk

Merge "Switch tethering stats from the unix socket to binder."

2017-09-05 09:26:26 +00:00