OSDN Git Service

[automerger skipped] Merge "Ask netd to swap stats map before reading" into qt-dev
authorChenbo Feng <fengc@google.com>
Tue, 23 Apr 2019 22:13:56 +0000 (15:13 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Apr 2019 22:13:56 +0000 (15:13 -0700)
am: 32b47dece4 -s ours
am skip reason: change_id I8fa37c26bec23ffca0b29b679e72ba1189f557f1 with SHA1 f729cb5fd6 is in history

Change-Id: I48dc5783885a97a0b0c975202c5878c058695524


Trivial merge