Commit 6f887610 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-3b6a3916-25a5-4937-a978-aa9d7658661a" into oc-dev 

* changes:
  [automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: 6245466d am: b8af4e4a am: a5fc127a am: 13215667 skipped: 8e9b5259
  [automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: 6245466d am: b8af4e4a am: a5fc127a am: 13215667
  [automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: 6245466d am: b8af4e4a am: a5fc127a
  [automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: 6245466d am: b8af4e4a
  [automerger] DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf am: 6245466d
  DO NOT MERGE BNEP: Fix build breakage by using osi_free instead of GKI_freebuf
parents 47660ad6 3fd42317
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment