OSDN Git Service

Merge changes from topic "gd_security_shim" am: c0b890c4f9 am: 25586afa90
authorTreehugger Robot <treehugger-gerrit@google.com>
Thu, 1 Oct 2020 18:35:29 +0000 (18:35 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 1 Oct 2020 18:35:29 +0000 (18:35 +0000)
Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1443318

Change-Id: If9f0e83102bd29a591997b354eaa1d6fd3ff585a

1  2 
stack/include/btm_api_types.h

Simple merge