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:59:53 +0000 (19:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 19:59:53 +0000 (19:59 +0000)
commitdf59fe7dd257ce523f82b61c2a10325286bf370a
tree49206a08e59ca69fcb1c8b12fd803b0ddeb6c6e9
parentf2a262c179b7684bd9a5ef3b8703f00187f126e1
parent1339bf82c1fa0f799b3ff20ad2fdb00a718b475c
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
am: 1339bf82c1

Change-Id: I152c714a45872295c754391e560d339a269943df