OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
536c5bb
8196301
)
[automerger skipped] Merge "Check for bpf support at NetworkStatsService start" am...
author
Chenbo Feng
<fengc@google.com>
Wed, 30 May 2018 22:17:21 +0000
(15:17 -0700)
committer
android-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