summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* two digit number handling in croatia and serbiaIrfan Sheriff2011-02-023-0/+68
* Merge "Final final final Gingerbread MR API changes." into gingerbreadNick Pelly2011-02-016-31/+97
|\
| * Final final final Gingerbread MR API changes.Nick Pelly2011-02-016-31/+97
* | Merge "Do not check features in PackageManagerService DO NOT MERGE" into ging...Dianne Hackborn2011-01-315-0/+57
|\ \
| * | Do not check features in PackageManagerService DO NOT MERGEKenny Root2011-01-315-0/+57
* | | Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2011-01-311-1/+1
|\ \ \ | |/ / |/| |
| * | Import revised translations. DO NOT MERGEEric Fischer2011-01-311-1/+1
| |/
* | DO NOT MERGE Fix issue #3408542: "resizeable" attribute required to get out o...Dianne Hackborn2011-01-311-2/+8
|/
* Tweak to make merges easierJean-Baptiste Queru2011-01-291-1/+1
* Merge "Add some network types that OEM's are asking for." into gingerbreadRobert Greenwalt2011-01-291-0/+9
|\
| * Add some network types that OEM's are asking for.Robert Greenwalt2011-01-281-0/+9
* | Import revised translations. DO NOT MERGEEric Fischer2011-01-284-9/+9
|/
* Merge "API: Make close() throw an IOException." into gingerbreadNick Pelly2011-01-273-4/+5
|\
| * API: Make close() throw an IOException.Nick Pelly2011-01-273-4/+5
* | Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2011-01-275-9/+9
|\ \ | |/ |/|
| * Import revised translations. DO NOT MERGEEric Fischer2011-01-275-9/+9
* | Fix build - javadoc.Nick Pelly2011-01-271-1/+1
* | Merge "Clean up MifareUltralight API." into gingerbreadNick Pelly2011-01-272-30/+74
|\ \
| * | Clean up MifareUltralight API.Nick Pelly2011-01-272-30/+74
| |/
* | Merge "Update networktype before sending state change." into gingerbreadRobert Greenwalt2011-01-272-8/+10
|\ \ | |/ |/|
| * Update networktype before sending state change.Robert Greenwalt2011-01-262-8/+10
* | Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.Dianne Hackborn2011-01-261-1/+1
* | Merge "Make OBB results a one-way call" into gingerbreadKenny Root2011-01-261-1/+2
|\ \ | |/ |/|
| * Make OBB results a one-way callKenny Root2011-01-251-1/+2
* | Merge "Use classnames instead of ints for NFC techs." into gingerbreadJeff Hamilton2011-01-2510-50/+167
|\ \ | |/ |/|
| * Use classnames instead of ints for NFC techs.Jeff Hamilton2011-01-2510-50/+167
* | Make Mifare Classic increment/decrement operands little endianNick Pelly2011-01-251-2/+13
* | Updated checkbox assetsJustin Ho2011-01-2420-0/+0
|/
* Fix trace mismatch.Arnaud Ferir2011-01-241-1/+1
* Handle mock tags in android.nfc.Tag conversion to Parcel.Sylvain Fonteneau2011-01-241-2/+16
* Merge "Add operands to mifare classic increment, decrement." into gingerbreadNick Pelly2011-01-231-12/+19
|\
| * Add operands to mifare classic increment, decrement.Nick Pelly2011-01-231-12/+19
* | Merge "Make MifareClassic methods more consistent." into gingerbreadNick Pelly2011-01-231-189/+186
|\ \ | |/
| * Make MifareClassic methods more consistent.Nick Pelly2011-01-231-189/+186
* | Merge "Allow null filters for foreground dispatch to act as catch all." into ...Jeff Hamilton2011-01-231-5/+11
|\ \
| * | Allow null filters for foreground dispatch to act as catch all.Jeff Hamilton2011-01-231-5/+11
* | | Fix 3379239: Catch exceptions from workaround for OOM.Jim Miller2011-01-231-2/+10
|/ /
* | Merge "Do Not Merge Connect other profiles when priority is auto connect." in...Jaikumar Ganesh2011-01-211-5/+9
|\ \
| * | Do Not Merge Connect other profiles when priority is auto connect.Jaikumar Ganesh2011-01-211-5/+9
* | | Merge "DO NOT MERGE - Create db path if it doesn't exit" into gingerbreadJohn Reck2011-01-211-3/+7
|\ \ \ | |_|/ |/| |
| * | DO NOT MERGE - Create db path if it doesn't exitJohn Reck2011-01-211-3/+7
* | | Merge "API changes for NFC." into gingerbreadJeff Hamilton2011-01-2114-160/+252
|\ \ \ | |/ / |/| |
| * | API changes for NFC.Jeff Hamilton2011-01-2114-160/+252
* | | Merge "Bug 3365937 notify TTS initialization listener of binding errors" into...Jean-Michel Trivi2011-01-211-5/+16
|\ \ \ | |/ / |/| |
| * | Bug 3365937 notify TTS initialization listener of binding errorsJean-Michel Trivi2011-01-201-5/+16
* | | Fix issue #3373438: Update GBMR versionsDianne Hackborn2011-01-201-1/+6
|/ /
* | Merge "Never drag scroll views with no children. (DO NOT MERGE)" into gingerb...Jeff Brown2011-01-192-7/+11
|\ \
| * | Never drag scroll views with no children. (DO NOT MERGE)Jeff Brown2011-01-192-7/+11
* | | Change signature of MifareClassic.authenticate*() to throw IOException.Nick Pelly2011-01-181-2/+2
* | | Support for TagLostException (API).Martijn Coenen2011-01-186-6/+160
|/ /