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

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 dalvik.vm.foreground-heap-growth-multiplier property" into oc-mr1-dev

2017-10-16 18:02:36 +00:00

proto/android

…

res

Merge "DO NOT MERGE Revert "Show dialog if top app is killed by lmk"" into oc-mr1-dev

2017-10-17 20:16:02 +00:00

tests

Batterystats handles nested unoptimized ble scans

2017-10-16 23:18:30 +00:00