OSDN Git Service

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

Change-Id: I3ed1c07f9ee15d3ae9127c9463fd587ee33d99ec


Trivial merge