[automerger skipped] Merge "Remove Settings constants for NetworkStack" am: d32d766a04

am: a4527d568f -s ours
am skip reason: change_id I7291cfa86cd6e907df35e8fbc97e2e9a77e56cab with SHA1 3429aac7ab is in history

Change-Id: I44109a0f0cd05940ef9f887f8e3b5906ad92bc1a
This commit is contained in:
Chiachang Wang
2019-04-24 22:16:27 -07:00
committed by android-build-merger

Diff Content Not Available