diff options
| author | Xin Li <delphij@google.com> | 2017-11-14 12:31:11 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2017-11-14 12:31:11 -0800 |
| commit | 248e2a0409adfe33f12ba3a4ddbf90f1b22cf37d (patch) | |
| tree | 00b60e5c5aa1eb0e155b2374a2c1f5cadfdef353 /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | 2fd102754a33e68fd44fec1d869364d3d2414ffa (diff) | |
| parent | c197ddbe056a7363416d3568dc70092e03cb4edd (diff) | |
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.
Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
0 files changed, 0 insertions, 0 deletions