tree 5ce63e7770898ee884712f701564f52df7dce980
parent 97a2566395fae3c130a8ba3ae8705405446df478
parent 672e04b5d288eb6e0a3310cc9d405cb0e9a48cc3
author Danica Chang <danicachang@google.com> 1279655265 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1279655265 -0700

Merge "deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp"