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

am: d3a5792024

Change-Id: I5bf43f78716769a6f1f90169f500e9eee7a91f18

2017-10-19 17:26:19 +00:00

..

java

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

2017-10-19 17:26:19 +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" am: b53262c148

2017-10-11 16:41:01 +00:00

tests

Batterystats handles nested unoptimized ble scans

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