| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | | | | | | | | | | | | | am e3263602: (-s ours) am b7a8d179: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-15 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | am 3da480ef: (-s ours) am 3c476dbc: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-13 | 0 | -0/+0 | |
| | |\| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | am 3c476dbc: (-s ours) Import translations. DO NOT MERGE | Geoff Mendal | 2015-07-13 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Automatic translation import | Michael Bestas | 2016-03-05 | 13 | -0/+504 | |
| * | | | | | | | | | | | | | | | | | | | | nfc: Make unknown protocol logs useful | Pat Erley | 2016-02-10 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/pac... | Steve Kondik | 2015-12-07 | 2 | -12/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'klp-modular-dev' of /usr/local/google/game/mirror/googleplex-an... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | * | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | | | | | | |\| | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | * | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | |/| / / / / / / / / / / / / / / / / / | | | | | | | | | |/ / / / / / / / / / / / / / / / / | ||||||
| | | | | | | | | | * | | | | | | | | | | | | | | | | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am... | The Android Open Source Project | 2015-10-20 | 0 | -0/+0 | |
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f | The Android Open Source Project | 2015-10-19 | 0 | -0/+0 | |
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 | The Android Open Source Project | 2015-10-19 | 0 | -0/+0 | |
| | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Reconcile with jb-mr0-release am: 29b858a5d6 | The Android Open Source Project | 2015-10-19 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Reconcile with jb-mr0-release | The Android Open Source Project | 2015-10-19 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Reconcile with jb-mr0-release | The Android Open Source Project | 2012-07-27 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge in jb-mr0-release history after reset to jb-dev | The Android Automerger | 2012-07-26 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Don't enable reader mode when NFC is disabled." into mnc-dr-dev | Martijn Coenen | 2015-10-19 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't enable reader mode when NFC is disabled. | Martijn Coenen | 2015-10-19 | 1 | -0/+4 | |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use global all-cpp-files-under | Dan Willemsen | 2015-10-13 | 1 | -12/+1 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NFC: Clean duplicated and unknown permissions | AdrianDC | 2015-11-19 | 1 | -3/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nfc: create a bootstrap service | Jorge Ruesga | 2015-11-07 | 2 | -0/+41 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic translation import | Michael Bestas | 2015-11-07 | 1 | -0/+8 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic translation import | Michael Bestas | 2015-11-07 | 2 | -14/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NFCService: Add sysprop to prevent FW download during boot with NFC off. | Tony Layher | 2015-11-07 | 1 | -1/+12 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic translation import | Michael Bestas | 2015-11-07 | 4 | -0/+158 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'android-6.0.0_r26' into HEAD | Ricardo Cerqueira | 2015-11-05 | 2 | -1/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-25 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-24 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-20 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-31 | 0 | -0/+0 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-25 | 0 | -0/+0 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-24 | 0 | -0/+0 | |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-04 | 0 | -0/+0 | |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-30 | 0 | -0/+0 | |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
 |
index : android_packages_apps_Nfc | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |