diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2011-01-21 21:25:01 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-21 21:25:01 -0800 |
| commit | 1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b (patch) | |
| tree | 6db5766941e10f8a77937a4b1ff724c76027a12e /core/java/android/nfc/NfcAdapter.java | |
| parent | 398a589ccea744556732b25097412dbb22c51271 (diff) | |
| parent | 40e6c210f88bfde3f5bc0faa93de0910f1a8181b (diff) | |
| download | frameworks_base-1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b.zip frameworks_base-1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b.tar.gz frameworks_base-1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b.tar.bz2 | |
Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
Diffstat (limited to 'core/java/android/nfc/NfcAdapter.java')
0 files changed, 0 insertions, 0 deletions