summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic translation importstable/cm-13.0-ZNH0Einky@build012016-09-181-0/+3
* Automatic translation importclyde@build012016-08-221-0/+40
* Automatic translation importpinky@build012016-08-181-0/+40
* Automatic translation importclyde@build012016-08-131-0/+40
* Allow system_server access to NFC reader mode API.Martijn Coenen2016-08-011-2/+3
* Verify setForegroundDispatch caller is in foreground.Martijn Coenen2016-07-071-1/+8
* Automatic translation importAbhisek Devkota2016-05-181-0/+1
* Automatic translation importAbhisek Devkota2016-05-1417-0/+664
* Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/pac...Steve Kondik2015-12-072-12/+5
|\
| * Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
| |\
| | * Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
| | |\
| | | * Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
| | | |\
| | | | * Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
| | | | |\
| | | | | * Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
| | | | | |\
| | | | | | * Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
| | | | | | |\
| | | | | | | * Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
| | | | | | | |\
| | | | | | | | * Merge branch 'klp-modular-dev' of /usr/local/google/game/mirror/googleplex-an...The Android Open Source Project2015-10-200-0/+0
| | | | | | | | |\
| | | | | | | | | * Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| | | | | | | | | |\
| * | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| | |\| | | | | | | |
| | | * | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| | | |\| | | | | | |
| | | | * | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| | | | |\| | | | | |
| | | | | * | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| | | | | |\| | | | |
| | | | | | * | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| | | | | | |\| | | |
| | | | | | | * | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| | | | | | | |\| | |
| | | | | | | | * | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| | | | | | | | |\ \ \ | | | | | | | | | |/ / | | | | | | | | |/| / | | | | | | | | | |/
| | | | | | | | | * Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| | | | | | | | | |\
| | | | | | | | | | * Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73fThe Android Open Source Project2015-10-190-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8The Android Open Source Project2015-10-190-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * Reconcile with jb-mr0-release am: 29b858a5d6The Android Open Source Project2015-10-190-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * Reconcile with jb-mr0-releaseThe Android Open Source Project2015-10-190-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
| | | | | | | | | | | | | | | | | |\
| * | | | | | | | | | | | | | | | | \ Merge "Don't enable reader mode when NFC is disabled." into mnc-dr-devMartijn Coenen2015-10-191-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Don't enable reader mode when NFC is disabled.Martijn Coenen2015-10-191-0/+4
| * | | | | | | | | | | | | | | | | | | Use global all-cpp-files-underDan Willemsen2015-10-131-12/+1
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | NFC: Clean duplicated and unknown permissionsAdrianDC2015-11-191-3/+0
* | | | | | | | | | | | | | | | | | | nfc: create a bootstrap serviceJorge Ruesga2015-11-072-0/+41
* | | | | | | | | | | | | | | | | | | Automatic translation importMichael Bestas2015-11-071-0/+8
* | | | | | | | | | | | | | | | | | | Automatic translation importMichael Bestas2015-11-072-14/+1
* | | | | | | | | | | | | | | | | | | NFCService: Add sysprop to prevent FW download during boot with NFC off.Tony Layher2015-11-071-1/+12
* | | | | | | | | | | | | | | | | | | Automatic translation importMichael Bestas2015-11-074-0/+158
* | | | | | | | | | | | | | | | | | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-052-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-240-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-200-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-310-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-250-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \