Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | NativeNfcManager: Properly unconfigure NFC chipreplicant-4.2-0002 | Paul Kocialkowski | 2014-06-30 | 2 | -0/+5 |
* | fixed inconsistant defines that are supposed to match tagtechnology.java | doug yeager | 2013-02-21 | 1 | -2/+2 |
* | Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/pac... | Steve Kondik | 2013-02-12 | 13 | -799/+1163 |
|\ | |||||
| * | Snapshot b80adb2c263702442cf2f2d771168400e6ceb9f8 | The Android Open Source Project | 2012-12-13 | 13 | -799/+1163 |
* | | nfc: Add alternate firmware path | Steve Kondik | 2013-02-06 | 1 | -0/+5 |
* | | Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/pa... | Steve Kondik | 2012-12-27 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | Snapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01 | The Android Open Source Project | 2012-12-13 | 60 | -313/+17536 |
* | | Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/pa... | Steve Kondik | 2012-11-21 | 81 | -371/+17683 |
|\ \ | |||||
| * \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-29 | 0 | -0/+0 |
| |\ \ | |||||
| | * \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-25 | 0 | -0/+0 |
| | |\ \ | |||||
| | | * \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-23 | 0 | -0/+0 |
| | | |\ \ | |||||
| | | | * \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-23 | 0 | -0/+0 |
| | | | |\ \ | |||||
| | | | | * \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-16 | 0 | -0/+0 |
| | | | | |\ \ | |||||
| | | | | | * \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-13 | 0 | -0/+0 |
| | | | | | |\ \ | |||||
| | | | | | | * \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-11 | 0 | -0/+0 |
| | | | | | | |\ \ | |||||
| | | | | | | | * \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-10 | 0 | -0/+0 |
| | | | | | | | |\ \ | |||||
| | | | | | | | | * \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-09 | 0 | -0/+0 |
| | | | | | | | | |\ \ | |||||
| | | | | | | | | | * \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-09 | 0 | -0/+0 |
| | | | | | | | | | |\ \ | | | | | | | | | | |/ / | | | | | | | | | |/| | | |||||
| | | | | | | | | * | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-07 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-05 | 0 | -0/+0 |
| | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-04 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-03 | 0 | -0/+0 |
| | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-02 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-01 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-30 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-27 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-26 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | | * | | | Don't hold the routing wakelock longer than a minute. | Martijn Coenen | 2012-09-21 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | * | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-21 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-19 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-12 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-09 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-06 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-09-04 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-29 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-28 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-27 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-20 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-16 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-14 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-13 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-09 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-08-08 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Serialize applying card emulation route. | Martijn Coenen | 2012-10-25 | 1 | -1/+10 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hold a wakelock during initialisation. | Martijn Coenen | 2012-10-24 | 1 | -45/+75 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay sending EE-wipe APDUs. | Martijn Coenen | 2012-10-23 | 1 | -0/+7 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong Beam image scaling on sw600 and larger devices. | Martijn Coenen | 2012-10-23 | 1 | -3/+13 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset RF field status on SE activation. | Martijn Coenen | 2012-10-22 | 1 | -0/+5 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix Beam animation for non-owner user." into jb-mr1-dev | Martijn Coenen | 2012-10-16 | 3 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Beam animation for non-owner user. | Martijn Coenen | 2012-10-15 | 3 | -0/+4 |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |