diff options
| author | Mike Lockwood <lockwood@google.com> | 2015-04-29 21:02:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-29 21:02:30 +0000 |
| commit | ec317987e06c9083a54bd32b5d10eee898345fe5 (patch) | |
| tree | 1b811f117f144c40e77c46eef563df0a5a25de8e /api | |
| parent | a7a67085107ea44a3febbd4ee85f9eb233b41f71 (diff) | |
| parent | 94582c5fb632b17b751729a929ff94ef8aa216a1 (diff) | |
| download | frameworks_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 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index db774df..d89481d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -14025,6 +14025,7 @@ package android.hardware.usb { method public java.lang.String getProductName(); method public java.lang.String getSerialNumber(); method public int getVendorId(); + method public java.lang.String getVersion(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.hardware.usb.UsbDevice> CREATOR; } diff --git a/api/system-current.txt b/api/system-current.txt index 9e78605..d8b1081 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -14929,6 +14929,7 @@ package android.hardware.usb { method public java.lang.String getProductName(); method public java.lang.String getSerialNumber(); method public int getVendorId(); + method public java.lang.String getVersion(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.hardware.usb.UsbDevice> CREATOR; } |