OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE Add bounds check for BNEP_Write" into oc...
authorHansong Zhang <hsz@google.com>
Fri, 13 Apr 2018 18:57:57 +0000 (11:57 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Apr 2018 18:57:57 +0000 (11:57 -0700)
am: 1bd5790f72  -s ours

Change-Id: I98e64840db2528f5bd1240a97f974612466a3f96


Trivial merge