Ben Schwartz 3017ebec8c Merge "Add a global setting to disable DNS over TLS" ...

am: 4a906c167b

Change-Id: Ie0f5586342b32c9e7c745ab9697b44158a920233

2017-10-20 15:08:55 +00:00

..

java

Merge "Add a global setting to disable DNS over TLS"

2017-10-20 15:08:55 +00:00

jni

Merge "more O_CLOEXEC"

2017-10-20 14:53:14 +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

Merge "Add a global setting to disable DNS over TLS"

2017-10-20 15:08:55 +00:00