diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-05-19 13:34:44 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-05-19 13:34:44 -0400 |
| commit | 90f902afde7ac92cdb60363d517e9d142e1f1977 (patch) | |
| tree | 5f98f00537d26214ae7d42f95f05e98761765413 /api | |
| parent | 191c1fbb7465dc6ba0cb2fa40c96b690ea73d68c (diff) | |
| parent | c1730dcf8971950a0e32e3f4fc6e3fb08b7395cd (diff) | |
| download | frameworks_base-90f902afde7ac92cdb60363d517e9d142e1f1977.zip frameworks_base-90f902afde7ac92cdb60363d517e9d142e1f1977.tar.gz frameworks_base-90f902afde7ac92cdb60363d517e9d142e1f1977.tar.bz2 | |
resolved conflicts for merge of c1730dcf to master
Change-Id: I9e0f9740930c7d3acb51235dd4c67cf2ed54a486
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index ca7b4e5..05ca9b3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9016,6 +9016,7 @@ package android.hardware.usb { method public void close(); method public int controlTransfer(int, int, int, int, byte[], int, int); method public int getFileDescriptor(); + method public byte[] getRawDescriptors(); method public java.lang.String getSerial(); method public boolean releaseInterface(android.hardware.usb.UsbInterface); method public android.hardware.usb.UsbRequest requestWait(); |