OSDN Git Service

[automerger skipped] Merge "Check for bpf support at NetworkStatsService start" am...
authorChenbo Feng <fengc@google.com>
Wed, 30 May 2018 22:17:21 +0000 (15:17 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 May 2018 22:17:21 +0000 (15:17 -0700)
am: 8196301e24  -s ours

Change-Id: I4b8e1669b80040287dd96423e8384e189db4af2d


Trivial merge