tree f332ea19d0ae06467f3dadb26a253b625bb53a8d
parent 68770715e3feb7d631c4af4b15db28ebd3419f41
parent d3f8bbc6c0974d4fb83199ed867cc7635028f3eb
author Remi NGUYEN VAN <reminv@google.com> 1566530393 -0700
committer android-build-merger <android-build-merger@google.com> 1566530393 -0700

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

Change-Id: I25e6a04e2e8dc7802b25b873612624a5f7cf791a