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:18:38 +0000 (01:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 13 Jan 2018 01:18:38 +0000 (01:18 +0000)
am: 6123aedafe  -s ours

Change-Id: Iad65834ed4244f7de543120f9d051a597c88e098


Trivial merge