summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Nfc: Dutch translationsKasper Hettinga2012-11-101-3/+3
* Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/pa...Steve Kondik2012-10-096-8/+417
|\
| * merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-260-0/+0
| |\
| * | Fix type of collision resolution record.Martijn Coenen2012-07-251-1/+3
| * | Implement connection handover LLCP service.Martijn Coenen2012-07-256-7/+414
* | | on handsets where Gwallet is enabled, HCE turns off for good after Gwallet is...doug yeager2012-10-031-48/+50
* | | Merge "card emulation patch port to JB" into jellybeanSteve Kondik2012-08-317-365/+1349
|\ \ \
| * | | card emulation patch port to JBdoug yeager2012-08-287-365/+1349
| |/ /
* | | Merge branch 'jb-release' of https://android.googlesource.com/platform/packag...Steve Kondik2012-08-100-0/+0
|\ \ \ | | |/ | |/|
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-190-0/+0
| |\ \ | | |/ | |/|
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-140-0/+0
| | |\
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-110-0/+0
| | | |\
| | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-080-0/+0
| | | | |\
| | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-070-0/+0
| | | | | |\
| | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-060-0/+0
| | | | | | |\
| | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-050-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-030-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-310-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-300-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-290-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-230-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-200-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * Eliminate obsolete flag.Craig Mautner2012-05-171-1/+0
| | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-170-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-160-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-140-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * Bluetooth Beam bug fixes, UX and i18n.Martijn Coenen2012-05-116-113/+307
| | | | | | | | | | | | | | | | | | * Call right Bluetooth enable API.Martijn Coenen2012-05-111-1/+1
| | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-04-250-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-240-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-230-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-170-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * Force bluetooth OPP to handle ACTION_SEND.Martijn Coenen2012-04-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-04-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-03-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-02-020-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-release history after reset to masterThe Android Automerger2012-01-300-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\