| commit | 1fd46833ef537b0a894575f98fc152ee5c1b5876 | [log] [tgz] |
|---|---|---|
| author | Ben Schwartz <bemasc@google.com> | Fri Oct 20 15:15:14 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 20 15:15:14 2017 +0000 |
| tree | 9cbd49da09a9920a641312745a1d1b387c44b10a | |
| parent | ecf2bdb46faa92e80d73d0af222cf479755c06a0 [diff] | |
| parent | ed97eaeb4ad2a321df94173be2734504ee683b76 [diff] |
Merge "Add a developer option for controlling DNS over TLS" am: c8207de343 am: ed97eaeb4a Change-Id: Iafc1e11d79f163d57e1d5e8bb3524c3d44f1b240