summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2015-04-29 21:02:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-29 21:02:30 +0000
commitec317987e06c9083a54bd32b5d10eee898345fe5 (patch)
tree1b811f117f144c40e77c46eef563df0a5a25de8e /core/java/android/net
parenta7a67085107ea44a3febbd4ee85f9eb233b41f71 (diff)
parent94582c5fb632b17b751729a929ff94ef8aa216a1 (diff)
downloadframeworks_base-ec317987e06c9083a54bd32b5d10eee898345fe5.zip
frameworks_base-ec317987e06c9083a54bd32b5d10eee898345fe5.tar.gz
frameworks_base-ec317987e06c9083a54bd32b5d10eee898345fe5.tar.bz2
am 94582c5f: am 973a70d7: am f105f61d: Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev
* commit '94582c5fb632b17b751729a929ff94ef8aa216a1': UsbDevice: Add support for retrieving version string for a USB device
Diffstat (limited to 'core/java/android/net')
0 files changed, 0 insertions, 0 deletions