| commit | 71084d863daec304aa77d759bc9de5b737a256a4 | [log] [tgz] |
|---|---|---|
| author | Chen Chen <cncn@google.com> | Wed Jan 27 18:48:48 2021 +0000 |
| committer | Chen Chen <cncn@google.com> | Wed Jan 27 18:51:37 2021 +0000 |
| tree | 6168cfac6ec6446a9586576fc9eb622754ffc40c | |
| parent | 21d2e206814425f76e5887fd4713517d1a3cde9b [diff] | |
| parent | 69a065d8f644f01afed0eda8480bc814f13f1d46 [diff] |
resolve merge conflicts of 69a065d8f644f01afed0eda8480bc814f13f1d46 to sc-dev Bug: 160794467 Bug: 178441949 Test: atest BluetoothInstrumentationTests Merged-In: I5177efac17ea9ccbeecee232bcc321867a19c693 Change-Id: I0c2dd5c89af43fa05aac6a021a9b446308d270f9