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 20:04:26 +0000 (20:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 20:04:26 +0000 (20:04 +0000)
am: e57b3c535e  -s ours

Change-Id: I6bc74ec3a6eea59aee4112065ef19d8ad2f86dd7


Trivial merge