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:26:52 +0000 (19:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 19:26:52 +0000 (19:26 +0000)
commite3614bb6d77fb139c0131b3c269ed5c89d80d971
tree20943aa97eac6bcc043bbdb628f37f561ae22ccd
parentec7e95495280d1d78386d0de4b3dbbd62f4c4b15
parent4b94d30c60f6b3e5a58d823dba28a728516ca0f5
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

Change-Id: I3ed1c07f9ee15d3ae9127c9463fd587ee33d99ec