OSDN Git Service

Merge "BNEP: Check received frame type" into nyc-dev am: 3f25ecf630 am: b4cfd05ab3...
authorMyles Watson <mylesgw@google.com>
Sat, 13 Jan 2018 01:26:09 +0000 (01:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 13 Jan 2018 01:26:09 +0000 (01:26 +0000)
am: 7dd771c673  -s ours

Change-Id: I416a9ba98cc75f422ad9403aa5db88050f3d7470


Trivial merge