[automerger skipped] Merge "Fixup SntpClient to bypass Private DNS" am: 460423d54e

Browse Source

am: abc58bf062  -s ours

Change-Id: I544b4901f51e6c3038045ef8f7e838161e06ec39

...

This commit is contained in:

Erik Kline

2018-05-24 11:32:32 -07:00

committed by android-build-merger

parent f1a24ac049 abc58bf062

commit fbc13e31d7

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available