diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-14 17:39:43 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-14 17:39:43 -0700 |
| commit | 221830b93d6f35bcf20db2d34978392b43f44221 (patch) | |
| tree | d6820eb7f53c45190f6603e9f95b9dd2d0981157 /api | |
| parent | 3fabad87f6cade6ccf7dc6d716e8b91675982088 (diff) | |
| parent | 015b1ecaec27b7cf5f1a78099d9ae34a0c3169f2 (diff) | |
| download | frameworks_base-221830b93d6f35bcf20db2d34978392b43f44221.zip frameworks_base-221830b93d6f35bcf20db2d34978392b43f44221.tar.gz frameworks_base-221830b93d6f35bcf20db2d34978392b43f44221.tar.bz2 | |
Merge "Add support for USB accessory serial numbers" into honeycomb-mr1
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/api/current.xml b/api/current.xml index 3f8b5fe..7eef62f 100644 --- a/api/current.xml +++ b/api/current.xml @@ -94481,6 +94481,17 @@ visibility="public" > </method> +<method name="getSerial" + return="java.lang.String" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</method> <method name="getUri" return="java.lang.String" abstract="false" @@ -267064,7 +267075,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="arg0" type="T"> +<parameter name="t" type="T"> </parameter> </method> </interface> |