diff options
| author | Pavlin Radoslavov <pavlin@google.com> | 2016-06-03 11:12:17 -0700 |
|---|---|---|
| committer | Pavlin Radoslavov <pavlin@google.com> | 2016-06-03 11:12:17 -0700 |
| commit | 3d70b1b43265e15e6cca77e3d0cd55028641b877 (patch) | |
| tree | 5868fa74fc773fe9154ea4d9019428b5c9110678 /framework/java/android/bluetooth/BluetoothSocket.java | |
| parent | d106e9989de198407feee3f67ad3b6280dae09a7 (diff) | |
| parent | 4ad852934b9b5cc99e80805fb097dd018a2e5512 (diff) | |
resolve merge conflicts of 9eb77405 to nyc-dev-plus-aosp
Change-Id: I93f0fc1c427b02b0c864901f0a55e4cfaba35032
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothSocket.java')
0 files changed, 0 insertions, 0 deletions