diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-06-03 14:07:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-03 14:07:19 -0700 |
| commit | 1710f4ce685a4cf8255a60ad55ffb2010d432aaa (patch) | |
| tree | 586391b162c868110004408ac74b895ca05d01bf /framework/java/android/bluetooth/BluetoothSocket.java | |
| parent | bfff24f6b04c8b849b491edaf52dd25e325a3431 (diff) | |
| parent | ad8ebf63f2aa69837569b01b0f53d3db8d785ab1 (diff) | |
am ad8ebf63: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'ad8ebf63f2aa69837569b01b0f53d3db8d785ab1':
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothSocket.java')
0 files changed, 0 insertions, 0 deletions