summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am bb65a8d8: Allow NfcB connects in NCI stack.Martijn Coenen2012-08-072-4/+4
|\
| * Allow NfcB connects in NCI stack.Martijn Coenen2012-08-072-4/+4
* | am 618ed5a4: (-s ours) Dump NFC controller firmware version in the logs. (DO ...Martijn Coenen2012-08-070-0/+0
|\ \ | |/
| * Dump NFC controller firmware version in the logs. (DO NOT MERGE)Martijn Coenen2012-08-061-2/+20
* | am 80cd2d68: (-s ours) Fix race conditions in NdefPushServer. (DO NOT MERGE)Martijn Coenen2012-08-070-0/+0
|\ \ | |/
| * Fix race conditions in NdefPushServer. (DO NOT MERGE)Martijn Coenen2012-08-021-19/+48
* | am 11d1aed9: (-s ours) Don\'t route PPSE AIDs to the host by default. (DO NOT...Martijn Coenen2012-08-070-0/+0
|\ \ | |/
| * Don't route PPSE AIDs to the host by default. (DO NOT MERGE)Martijn Coenen2012-08-021-2/+0
* | am a0069c82: (-s ours) Follow-up NFC code drop. (DO NOT MERGE)Martijn Coenen2012-08-070-0/+0
|\ \ | |/
| * Follow-up NFC code drop. (DO NOT MERGE)Martijn Coenen2012-08-016-188/+92
* | am a3f98c28: (-s ours) NFC: Initial NCI DeviceHost and JNI implementation. (D...Martijn Coenen2012-08-070-0/+0
|\ \ | |/
| * NFC: Initial NCI DeviceHost and JNI implementation. (DO NOT MERGE)Martijn Coenen2012-08-0143-23/+16179
* | am 96c08a7d: (-s ours) Point jni class references to new dhimpl package. (DO ...Martijn Coenen2012-08-070-0/+0
|\ \ | |/
| * Point jni class references to new dhimpl package. (DO NOT MERGE)Martijn Coenen2012-08-017-20/+20
* | am 25b0c5d2: (-s ours) Fix type of collision resolution record. (DO NOT MERGE)Martijn Coenen2012-08-070-0/+0
|\ \ | |/
| * Fix type of collision resolution record. (DO NOT MERGE)Martijn Coenen2012-08-011-1/+3
* | am 721d0196: (-s ours) Implement connection handover LLCP service. (DO NOT ME...Martijn Coenen2012-08-070-0/+0
|\ \ | |/
| * Implement connection handover LLCP service. (DO NOT MERGE)Martijn Coenen2012-08-016-7/+414
* | am 4b33b45e: (-s ours) Move NXP JNI and DeviceHost implementation into separa...Martijn Coenen2012-08-070-0/+0
|\ \ | |/
| * Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)Martijn Coenen2012-08-0122-9/+20
* | am 51a43593: (-s ours) Revert "Move NXP JNI and DeviceHost implementation int...Martijn Coenen2012-08-070-0/+0
|\ \ | |/
| * Revert "Move NXP JNI and DeviceHost implementation into separate dir." (DO NO...Martijn Coenen2012-08-0121-17/+9
* | am c2b3f02b: (-s ours) Move NXP JNI and DeviceHost implementation into separa...Martijn Coenen2012-08-070-0/+0
|\ \ | |/
| * Move NXP JNI and DeviceHost implementation into separate dir. (DO NOT MERGE)Martijn Coenen2012-08-0121-9/+17
* | Dump NFC controller firmware version in the logs.Martijn Coenen2012-08-061-2/+20
* | Fix race conditions in NdefPushServer.Martijn Coenen2012-08-031-19/+48
* | Don't route PPSE AIDs to the host by default.Martijn Coenen2012-08-021-2/+0
* | Merge "Follow-up NFC code drop." into jb-mr1-devMartijn Coenen2012-07-306-188/+92
|\ \
| * | Follow-up NFC code drop.Martijn Coenen2012-07-306-188/+92
* | | Merge "NFC: Initial NCI DeviceHost and JNI implementation." into jb-mr1-devMartijn Coenen2012-07-2743-23/+16179
|\ \ \ | |/ /
| * | NFC: Initial NCI DeviceHost and JNI implementation.Martijn Coenen2012-07-2743-23/+16179
* | | am 29b858a5: Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-270-0/+0
|\ \ \ | |/ / |/| |
| * | Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-270-0/+0
| |\ \
| | * \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-260-0/+0
| | |\ \
* | | \ \ am 238cce65: am 69369b77: am 43f22631: Fix type of collision resolution record.Martijn Coenen2012-07-250-0/+0
|\ \ \ \ \
| * \ \ \ \ am 69369b77: am 43f22631: Fix type of collision resolution record.Martijn Coenen2012-07-250-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 43f22631: Fix type of collision resolution record.Martijn Coenen2012-07-251-1/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | Fix type of collision resolution record.Martijn Coenen2012-07-251-1/+3
* | | | | | am 73eac104: am afa30410: am 327d0e7c: Implement connection handover LLCP ser...Martijn Coenen2012-07-250-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am afa30410: am 327d0e7c: Implement connection handover LLCP service.Martijn Coenen2012-07-250-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 327d0e7c: Implement connection handover LLCP service.Martijn Coenen2012-07-256-7/+414
| | |\ \ \ \ | | | |/ / /
| | | * | | Implement connection handover LLCP service.Martijn Coenen2012-07-256-7/+414
| | | | |/ | | | |/|
* | | | | Point jni class references to new dhimpl package.Martijn Coenen2012-07-257-20/+20
|/ / / /
* | | | Move NXP JNI and DeviceHost implementation into separate dir.Martijn Coenen2012-07-2522-9/+20
* | | | Revert "Move NXP JNI and DeviceHost implementation into separate dir."Martijn Coenen2012-07-2421-17/+9
* | | | Move NXP JNI and DeviceHost implementation into separate dir.Martijn Coenen2012-07-2421-9/+17
* | | | Fix type of collision resolution record.Martijn Coenen2012-07-231-1/+3
* | | | Merge "Implement connection handover LLCP service."Martijn Coenen2012-07-206-7/+414
|\ \ \ \
| * | | | Implement connection handover LLCP service.Martijn Coenen2012-07-166-7/+414
* | | | | Import translations. DO NOT MERGEYing Wang2012-07-131-3/+3
|/ / / /