OSDN Git Service

resolved conflicts for merge of c1730dcf to master
authorMike Lockwood <lockwood@android.com>
Thu, 19 May 2011 17:34:44 +0000 (13:34 -0400)
committerMike Lockwood <lockwood@android.com>
Thu, 19 May 2011 17:34:44 +0000 (13:34 -0400)
commit90f902afde7ac92cdb60363d517e9d142e1f1977
tree5f98f00537d26214ae7d42f95f05e98761765413
parent191c1fbb7465dc6ba0cb2fa40c96b690ea73d68c
parentc1730dcf8971950a0e32e3f4fc6e3fb08b7395cd
resolved conflicts for merge of c1730dcf to master

Change-Id: I9e0f9740930c7d3acb51235dd4c67cf2ed54a486
api/current.txt
core/jni/android_hardware_UsbDeviceConnection.cpp