OSDN Git Service

Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev...
authorHansong Zhang <hsz@google.com>
Fri, 12 Jan 2018 19:22:18 +0000 (19:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 19:22:18 +0000 (19:22 +0000)
am: babe2f806a  -s ours

Change-Id: I20565790a235d9dcabdd109fab65fcde414c06e3


Trivial merge