resolved conflicts for merge of c1730dcf to master
Change-Id: I9e0f9740930c7d3acb51235dd4c67cf2ed54a486
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 @@
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();