[automerger skipped] Merge "Check for bpf support at NetworkStatsService start" am: 0defa6e72c

am: 8196301e24  -s ours

Change-Id: I4b8e1669b80040287dd96423e8384e189db4af2d
This commit is contained in:
Chenbo Feng
2018-05-30 15:17:21 -07:00
committed by android-build-merger

Diff Content Not Available