summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Reconcile with ics-factoryrom-2-releaseandroid-sdk-adt_r16.0.1android-cts-4.0_r1ics-mr0The Android Open Source Project2011-11-160-0/+0
|\
| * Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-factoryrom-2-releaseThe Android Automerger2011-11-024-124/+10
| * merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
| |\
| | * Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"The Android Automerger2011-11-024-124/+10
| | * merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
| |/|
| | * Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"The Android Automerger2011-11-024-124/+10
| |/
* / Import revised translations. DO NOT MERGEandroid-4.0.2_r1ics-mr0-releaseEric Fischer2011-11-082-2/+2
|/
* Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-010-0/+0
|\
| * Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"The Android Automerger2011-10-314-124/+10
|/
* Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-10-310-0/+0
|\
| * Revert "Add event logs for NFC events. DO NOT MERGE"The Android Automerger2011-10-304-124/+10
| * merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-10-300-0/+0
|/|
| * Revert "Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0"The Android Automerger2011-10-284-124/+10
|/
* Merge "Add event logs for NFC events. DO NOT MERGE" into ics-mr0Jeff Hamilton2011-10-284-10/+124
|\
| * Add event logs for NFC events. DO NOT MERGEJeff Hamilton2011-10-274-10/+124
* | Import revised translations. DO NOT MERGEEric Fischer2011-10-271-1/+1
|/
* Merge "DO NOT MERGE. Set NFC EEPROM area to default value for FW 109.7." into...Nick Pelly2011-10-261-1/+2
|\
| * DO NOT MERGE. Set NFC EEPROM area to default value for FW 109.7.Martijn Coenen2011-10-261-1/+2
* | Import revised translations. DO NOT MERGEEric Fischer2011-10-241-1/+1
|/
* Merge "NFC: Enable guard host timeout." into ics-mr0Martijn Coenen2011-10-214-3/+27
|\
| * NFC: Enable guard host timeout.Martijn Coenen2011-10-214-3/+27
* | Merge "Start all NFC activities from a dedicated root task." into ics-mr0Martijn Coenen2011-10-213-37/+81
|\ \ | |/ |/|
| * Start all NFC activities from a dedicated root task.Martijn Coenen2011-10-173-37/+81
* | Fix crash when turning screen off and NFC is off.Martijn Coenen2011-10-191-6/+4
* | Import revised translations. DO NOT MERGEEric Fischer2011-10-182-1/+15
* | Make the crash on screen off less frequent.Jeff Hamilton2011-10-173-16/+35
* | Final NFC animation tweaks.Martijn Coenen2011-10-143-36/+18
|/
* NFC: Remove statusbar/navbar from animated screenshot.Martijn Coenen2011-10-113-28/+39
* NFC: enable low-power RF polling feature.Martijn Coenen2011-10-111-2/+2
* Merge "Import revised translations."Eric Fischer2011-10-104-6/+6
|\
| * Import revised translations.Eric Fischer2011-10-104-6/+6
* | Merge "NFC screenshot animation adjustments: - eliminate discontinuous jump w...Brandon Keely2011-10-101-25/+44
|\ \
| * | NFC screenshot animation adjustments:Brandon Keely2011-10-071-25/+44
| |/
* / Updated FireflyRenderThread to be more subtle and depthy.Brandon Keely2011-10-072-55/+34
|/
* Merge "Import revised translations."Eric Fischer2011-09-3045-0/+630
|\
| * Import revised translations.Eric Fischer2011-09-3045-0/+630
* | Add DUMP permissions checkKenny Root2011-09-301-0/+9
|/
* am 732f77cf: (-s ours) Import revised translations. DO NOT MERGE.Eric Fischer2011-09-280-0/+0
|\
| * Import revised translations. DO NOT MERGE.Eric Fischer2011-09-283-3/+3
* | NfcService: call enableAppSwitches for additional events.mike wakerly2011-09-282-7/+16
* | am 416d5ff3: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-270-0/+0
|\|
| * Import revised translations. DO NOT MERGEEric Fischer2011-09-276-8/+8
* | am c625b19e: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-260-0/+0
|\|
| * Import revised translations. DO NOT MERGEEric Fischer2011-09-2636-64/+103
* | Merge "Fix NFC to only be enabled when the lockscreen is dismissed."Jeff Hamilton2011-09-261-1/+1
|\ \
| * | Fix NFC to only be enabled when the lockscreen is dismissed.Jeff Hamilton2011-09-261-1/+1
* | | am 01400378: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-230-0/+0
|\ \ \ | |/ / |/| / | |/
| * Import revised translations. DO NOT MERGEEric Fischer2011-09-2340-0/+591
* | Merge "Improve NFC Admin permission strings, for easier translation."Nick Pelly2011-09-221-2/+3
|\ \ | |/ |/|
| * Improve NFC Admin permission strings, for easier translation.Nick Pelly2011-09-221-2/+3
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-08 18:20:18 +0000