diff options
| author | Sharvil Nanavati <sharvil@google.com> | 2015-06-23 14:07:26 -0700 |
|---|---|---|
| committer | Sharvil Nanavati <sharvil@google.com> | 2015-06-23 14:07:26 -0700 |
| commit | 8f68b0f68c5976039656ba8dbb95896f22e58c88 (patch) | |
| tree | 73cdf5f8509b45e845621c51180d175ee7fb4afa /framework/java/android/bluetooth/BluetoothSocket.java | |
| parent | f83a81b94fd3f4ede28cb5910f6012db59f3b5d0 (diff) | |
| parent | 5f1a96fb7a27d2f66a9c66a05d2945a864108df5 (diff) | |
resolved conflicts for merge of 5f1a96fb to lmp-mr1-ub-dev
Change-Id: I8ec2e76756e61a6e6bbe85ca699facbde1c1fbc7
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothSocket.java')
0 files changed, 0 insertions, 0 deletions