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:54:17 +0000 (19:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 19:54:17 +0000 (19:54 +0000)
commit1339bf82c1fa0f799b3ff20ad2fdb00a718b475c
tree41e28f86b44d9a0ccbb71017cb7d5ff1cdffcd43
parentbb1ae12d8764cdbe13ce9115d04b6df912fbeca3
parent56d163b30cd5210a2275afbc008f522aad6bb6d6
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into mnc-dev am: a8ff361dfd am: 7d1d2cc30e am: f4ebee33e8 am: babe2f806a  -s ours am: 6ad1b26ba3 am: 531aa6ac4b am: 3dc167be47 am: 9194a3708c am: 4feed25d33  -s ours
am: 56d163b30c

Change-Id: I37032fd93c691e2f597fb6b76bef40a7abb6d69f