summaryrefslogtreecommitdiffstats
path: root/core/java/android/bluetooth/BluetoothSocket.java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2015-05-04 21:48:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-04 21:48:56 +0000
commitc81af1ca7838f79ecc39fe0a9bf269880fa515e5 (patch)
tree05ce6b7e087642d0e659ff380e17b43ed565cd43 /core/java/android/bluetooth/BluetoothSocket.java
parent0425de31cf9a2ad8e5883c64d27dc2ee90d0377c (diff)
parent8de1de1f0450c25ce6079f4b8674d4bb0114287e (diff)
downloadframeworks_base-c81af1ca7838f79ecc39fe0a9bf269880fa515e5.zip
frameworks_base-c81af1ca7838f79ecc39fe0a9bf269880fa515e5.tar.gz
frameworks_base-c81af1ca7838f79ecc39fe0a9bf269880fa515e5.tar.bz2
Merge "When returning, transition only existing shared elements." into mnc-dev
Diffstat (limited to 'core/java/android/bluetooth/BluetoothSocket.java')
0 files changed, 0 insertions, 0 deletions