summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow system_server access to NFC reader mode API.android-6.0.1_r68android-6.0.1_r67android-6.0.1_r62android-6.0.1_r54marshmallow-dr1.6-releaseMartijn Coenen2016-06-211-2/+3
* Verify setForegroundDispatch caller is in foreground.android-6.0.1_r53Martijn Coenen2016-05-271-1/+8
* Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...android-6.0.1_r45android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21marshmallow-dr1.5-releasemarshmallow-dr1.5-devThe 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-...android-6.0.1_r9android-6.0.1_r8android-6.0.1_r7android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr1-devThe 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: 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-devandroid-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1jb-mr0-releaseThe Android Automerger2012-07-260-0/+0
| | | | | | | | | | | | | | | | | | |\
* | | | | | | | | | | | | | | | | | | | am f08a81c4: Merge "Don\'t enable reader mode when NFC is disabled." into mnc...Martijn Coenen2015-10-191-0/+4
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Don\'t enable reader mode when NFC is disabled." into mnc-dr-devMartijn Coenen2015-10-191-0/+4
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | am a590e214: am e208aeb6: Use global all-cpp-files-underDan Willemsen2015-10-141-12/+1
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | am e208aeb6: Use global all-cpp-files-underDan Willemsen2015-10-141-12/+1
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Use global all-cpp-files-underDan Willemsen2015-10-131-12/+1
| | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am faea766f: (-s ours) am 30931b14: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 30931b14: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEmarshmallow-dr-devBaligh Uddin2015-09-242-2/+2
* | | | | | | | | | | | | | | | | | | | am 405f1723: am 8415fed4: Grant WiFi override permission to NFC process.Martijn Coenen2015-09-231-0/+1
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 8415fed4: Grant WiFi override permission to NFC process.Martijn Coenen2015-09-231-0/+1
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Grant WiFi override permission to NFC process.Martijn Coenen2015-09-231-0/+1
* | | | | | | | | | | | | | | | | | | | am 899ca873: (-s ours) am aa7adaeb: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am aa7adaeb: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-182-6/+6
* | | | | | | | | | | | | | | | | | | | am 8c9730a8: am 8605731e: Support Mifare Classic tag.Jizhou Liao2015-08-3128-44/+15050
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 8605731e: Support Mifare Classic tag.Jizhou Liao2015-08-3128-44/+15050
| |\| | | | | | | | | | | | | | | | | |