OSDN Git Service

[automerger skipped] Merge changes from topic "mnc-dev-check-pkt-when-processing...
authorStanley Tng <stng@google.com>
Wed, 11 Apr 2018 15:32:27 +0000 (08:32 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Apr 2018 15:32:27 +0000 (08:32 -0700)
am: 00a4003806  -s ours

Change-Id: I3f6a90234101816bf1bb529501300abcf8111f49


Trivial merge