diff options
| author | Pavlin Radoslavov <pavlin@google.com> | 2016-06-07 14:41:08 -0700 |
|---|---|---|
| committer | Pavlin Radoslavov <pavlin@google.com> | 2016-06-07 14:41:08 -0700 |
| commit | 2dfbc78ed4d43a359c48a39a847dc2ab479e8927 (patch) | |
| tree | 5868fa74fc773fe9154ea4d9019428b5c9110678 /framework/java/android/bluetooth/BluetoothSocket.java | |
| parent | 3d70b1b43265e15e6cca77e3d0cd55028641b877 (diff) | |
| parent | 35b9b54285806eb580633175780b60ab7db97b51 (diff) | |
resolve merge conflicts of ae7641a to nyc-dev-plus-aosp
Change-Id: I63d00b98c27d7fa1f30385e030b6ffee5e86dc73
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothSocket.java')
0 files changed, 0 insertions, 0 deletions