diff options
| author | Andreas Huber <andih@google.com> | 2011-02-16 08:50:37 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-16 08:50:37 -0800 |
| commit | 8db7a7bfadc7bdfa30f60bb06063f91b19234096 (patch) | |
| tree | 57a9d2af73bc1946a6cafacf205761757f6d9469 /core/java/android/nfc/NfcAdapter.java | |
| parent | 4bebbe5fea1b6d7f5deff6d41d7633308607c08b (diff) | |
| parent | ea47cb4edea4426b0da7807db10548ddae7104f2 (diff) | |
| download | frameworks_base-8db7a7bfadc7bdfa30f60bb06063f91b19234096.zip frameworks_base-8db7a7bfadc7bdfa30f60bb06063f91b19234096.tar.gz frameworks_base-8db7a7bfadc7bdfa30f60bb06063f91b19234096.tar.bz2 | |
Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread
Diffstat (limited to 'core/java/android/nfc/NfcAdapter.java')
0 files changed, 0 insertions, 0 deletions