Benedict Wong d3a5792024 Merge "Add support for AES-GCM-ESP as an IPSec algorithm" ...

am: b6df7f0d35

Change-Id: Ic099206a28c4f21fa796969c953a8d4e81e8495b

2017-10-19 17:14:53 +00:00

..

java

Merge "Add support for AES-GCM-ESP as an IPSec algorithm"

2017-10-19 17:14:53 +00:00

jni

Merge "Move to some properties users to libbase properties"

2017-10-12 21:01:53 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

2017-07-21 15:51:32 +00:00

res

Merge "Add MM#6 string overlay"

2017-10-11 16:31:10 +00:00

tests

Batterystats handles nested unoptimized ble scans

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