diff options
| author | Sharvil Nanavati <sharvil@google.com> | 2015-06-23 16:23:06 -0700 |
|---|---|---|
| committer | Sharvil Nanavati <sharvil@google.com> | 2015-06-23 16:23:06 -0700 |
| commit | 97438f1c68e65ff34221cf6295f38800d8f8c688 (patch) | |
| tree | 726a4fb0fa8ab759bc6b1876cae2585d8bb68081 /framework/java/android/bluetooth/BluetoothSocket.java | |
| parent | 9d6dfbef00176de7d27467de745cb4b1c81d25e9 (diff) | |
| parent | 8f68b0f68c5976039656ba8dbb95896f22e58c88 (diff) | |
resolved conflicts for merge of 8f68b0f6 to mnc-dev
Change-Id: I9340b816232285853740c03d5e9898fdd019ff0e
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothSocket.java')
0 files changed, 0 insertions, 0 deletions