[automerger skipped] Merge "Move TrafficStats tags for the network stack constants" am: 8f6e99b370 am: 4a92ec452f -s ours

am: c9d83b455f -s ours
am skip reason: change_id I4882686a86e7c6d42f4b0619b921d02619ed6d4c with SHA1 72172969cc is in history

Change-Id: I3e682721ed3e8a574d84d12baf84cc2d6c097412
This commit is contained in:
Chalard Jean
2019-04-17 00:06:14 -07:00
committed by android-build-merger

Diff Content Not Available