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:48:55 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 19:48:55 +0000 (19:48 +0000)
am: 4feed25d33  -s ours

Change-Id: Iaa4e7b5c051209eb841d04f0c4eff331d60c9345


Trivial merge