diff options
author | Joe Fernandez <joefernandez@google.com> | 2014-07-30 21:14:39 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-30 21:14:39 +0000 |
commit | 9386003cb9442b9acd06e1833443424c9ab656b3 (patch) | |
tree | 55d38b9dbf80365e1105d0179e14cab7d9a5ef63 /core/java/android/nfc/NfcAdapter.java | |
parent | d38347ec51e544c0faf59736de3d4b044f59ac6a (diff) | |
parent | a3e521540b1143264033ca217d11b90ec20e6c54 (diff) | |
download | frameworks_base-9386003cb9442b9acd06e1833443424c9ab656b3.zip frameworks_base-9386003cb9442b9acd06e1833443424c9ab656b3.tar.gz frameworks_base-9386003cb9442b9acd06e1833443424c9ab656b3.tar.bz2 |
am a3e52154: am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs
* commit 'a3e521540b1143264033ca217d11b90ec20e6c54':
docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
Diffstat (limited to 'core/java/android/nfc/NfcAdapter.java')
0 files changed, 0 insertions, 0 deletions