OSDN Git Service

Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp...
authorXin Li <delphij@google.com>
Tue, 1 Sep 2020 20:01:30 +0000 (20:01 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 1 Sep 2020 20:01:30 +0000 (20:01 +0000)
1  2 
stack/btm/btm_sec.cc

Simple merge