OSDN Git Service

resolve merge conflicts of 7d0ad232f to oc-dev-plus-aosp
authorPavlin Radoslavov <pavlin@google.com>
Thu, 13 Jul 2017 18:48:43 +0000 (11:48 -0700)
committerPavlin Radoslavov <pavlin@google.com>
Thu, 13 Jul 2017 18:48:47 +0000 (11:48 -0700)
commitaa7f7079f79870b5fa14bca867136c905a5f9f9e
treecbf27e8a8fff2c1497aa2c81cc54b994c96cad4f
parentc1265822c8bfd45978e3a9c036564ba19cc7f31f
parent7d0ad232f368b438091cb49a2ab3daa3710fe591
resolve merge conflicts of 7d0ad232f to oc-dev-plus-aosp

Test: Code inspection.
Change-Id: I13a192920f58d8cea622a6acb2fb46fd07fdd195
stack/bnep/bnep_utils.cc