tree b3721816e86b3c24259d908c844f9e81839ec131
parent afe708f5757fbeb4ae326cfa6e5d370fa1cfd6d1
parent a8aa5abfa07b54b41abb27d5da31ecb582e3f2dc
author Remi NGUYEN VAN <reminv@google.com> 1566622064 -0700
committer android-build-merger <android-build-merger@google.com> 1566622064 -0700

[automerger skipped] Merge "Remove DeviceConfig usage from NetworkStackClient" into stage-aosp-master am: d3f8bbc6c0 -s ours am: 56ac6f1ee7 -s ours
am: a8aa5abfa0 -s ours
am skip reason: change_id I423ca6ebb328f49b170baae0da9b8409a6429fcb with SHA1 7086666dea is in history

Change-Id: I4e623c46ddab96bd3b2e3b8a4841991ba8403f26