Benjamin Miller 5934ae605a Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev ...

am: 91f16ace4f

Change-Id: Id7d2c62577e0b534a7dd6605f722e7c5639e46b7

2017-07-28 17:30:18 +00:00

..

java

Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev

2017-07-28 17:30:18 +00:00

jni

Preload app-process HALs in Zygote

2017-07-12 20:44:52 +00:00

proto/android

DO NOT MERGE - Remove RetailDemoModeService

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

res

Merge "wifi: Modify the SAR power levels interface" into oc-dr1-dev

2017-07-28 02:47:04 +00:00

tests

Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev

2017-07-25 02:11:26 +00:00