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:32:36 +0000 (19:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 19:32:36 +0000 (19:32 +0000)
commita4f48e4e8d3fb472b73e876ef3b3e196f2abe654
treed28f67c0a23b5dbf9242fa5a91b9b260ff3888fe
parent64baebf6275ccee85dc5250b0518cdb3b493f821
parente3614bb6d77fb139c0131b3c269ed5c89d80d971
Merge "DO NOT MERGE Fix unexpected behavior in reading BNEP packets" into nyc-dev am: 6e677aab4a am: bd83a19885 am: 956bb8e1fb am: 552786c50f am: 4b94d30c60  -s ours
am: e3614bb6d7

Change-Id: Ia085dc761466af253818324e0d577c2155dcaa91