682c24e22811d4ee17ae1cd61bf255c3f7e722b7 |
|
12-Apr-2016 |
Trevor Johns <trevorjohns@google.com> |
Resolve merge conflicts of a5060ee to nyc-dev This undoes the automerger skip which occured in commit e740c84dc32180214a7fd157105d6c18d30408ee and replays it as a standard (NOT -s ours) merge. Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
/frameworks/base/core/java/android/nfc/tech/NfcBarcode.java
|
35bf6288527b177a04100585321a1266f020004a |
|
14-Oct-2013 |
Martijn Coenen <maco@google.com> |
NFC card emulation API docs. Bug: 10550319 Change-Id: I3023639d728aa76af89d15e0491b86c7c641648e
/frameworks/base/core/java/android/nfc/tech/NfcBarcode.java
|
7a6dfb2f7294bbfb5ebc4f937db97b659a447607 |
|
11-Dec-2012 |
Martijn Coenen <maco@google.com> |
Update NfcBarcode documentation for Kovio. Change-Id: I4b6a452805c3dd68247dbe5493db14a263729615
/frameworks/base/core/java/android/nfc/tech/NfcBarcode.java
|
ca0cf4ee782e474961e6de74f6004781773f957c |
|
25-Sep-2012 |
Martijn Coenen <maco@google.com> |
Fix build. Bug: 7222958 Change-Id: I2f9ff988f09be6cd4be49bfb90750a46e63c2c14
/frameworks/base/core/java/android/nfc/tech/NfcBarcode.java
|
0bec15ebed8b8639076cba184af3235e17f48718 |
|
24-Sep-2012 |
Martijn Coenen <maco@google.com> |
Add NfcBarcode technology API. Supporting only Kovio barcode technology for now. Bug: 7222958 Change-Id: I63976da2db16b0a5d9ec746f1a0e83833e74e5a9
/frameworks/base/core/java/android/nfc/tech/NfcBarcode.java
|