summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* Disable plugins if setPluginsEnabled(false) called.Tero Saarni2011-06-021-1/+1
* Merge "Require bonding and encryption for PBAP server"Jaikumar Ganesh2011-05-251-3/+63
|\
| * Require bonding and encryption for PBAP serverMathias Jeppsson2011-05-171-3/+63
* | Merge "BT: Wrong publishing result of bonding error code."Jaikumar Ganesh2011-05-201-1/+1
|\ \
| * | BT: Wrong publishing result of bonding error code.Arek Lichwa2011-05-051-1/+1
* | | Merge "support humidity sensor type"Jean-Baptiste Queru2011-05-182-1/+66
|\ \ \ | |_|/ |/| |
| * | support humidity sensor typeUrs Fleisch2011-04-132-1/+66
* | | Merge "Removing dead store; it was likely a relict of debuging code."Conley Owens2011-05-021-1/+0
|\ \ \ | |_|/ |/| |
| * | Removing dead store; it was likely a relict of debuging code.Jozef BABJAK2011-04-291-1/+0
* | | Merge "Adjust mBiggerTouchSlopSquare to the suitable value"Conley Owens2011-04-292-5/+23
|\ \ \
| * | | Adjust mBiggerTouchSlopSquare to the suitable valueMasanori Ogino2011-02-072-5/+23
* | | | Merge "Scolling using arrow keys with padding"Conley Owens2011-04-291-4/+2
|\ \ \ \
| * | | | Scolling using arrow keys with paddingMattias Petersson2011-04-071-4/+2
| | |_|/ | |/| |
* | | | Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"Conley Owens2011-04-291-3/+9
|\ \ \ \
| * | | | CHAR_SEQUENCE_CREATOR cannot handle null stringMartin Wallgren2011-04-071-3/+9
| |/ / /
* | | | Merge "Fix startSearch condition on Dialog, because pressing search key cause...Conley Owens2011-04-291-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix startSearch condition on Dialog, because pressing search key causes ANR p...lge-aosp2011-03-151-1/+1
* | | | Merge "Added null check on return value for getKeyDispatcherState()"Conley Owens2011-04-281-0/+4
|\ \ \ \
| * | | | Added null check on return value for getKeyDispatcherState()Per Andersson2011-04-281-0/+4
* | | | | Merge "Using robust equality check."Conley Owens2011-04-281-1/+1
|\ \ \ \ \
| * | | | | Using robust equality check.Jozef BABJAK2011-03-171-1/+1
* | | | | | Merge "We don't need these local references."Conley Owens2011-04-281-4/+4
|\ \ \ \ \ \
| * | | | | | We don't need these local references.Jozef BABJAK2011-03-171-4/+4
| |/ / / / /
* | | | | | Merge "Eliminating dead code with no other effect than consuming battery life."Conley Owens2011-04-281-3/+0
|\ \ \ \ \ \
| * | | | | | Eliminating dead code with no other effect than consuming battery life.Jozef BABJAK2011-03-171-3/+0
| |/ / / / /
* | | | | | am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"Conley Owens2011-04-271-2/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "onDetachedFromWindow is called before onAttachedToWindow"Conley Owens2011-04-271-2/+7
| |\ \ \ \ \
| | * | | | | onDetachedFromWindow is called before onAttachedToWindowMartin Wallgren2011-04-131-2/+7
| | | |_|/ / | | |/| | |
* | | | | | am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initial...Jean-Baptiste Queru2011-04-261-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Re-assingning local variable if mStringBlocks was initialized here. NPE is th...Jozef BABJAK2011-04-191-0/+1
| |/ / / /
* | | | | am 78a9766b: Merge "Implement teardown script." into gingerbreadJason parks2011-04-043-1/+92
|\ \ \ \ \
| * \ \ \ \ Merge "Implement teardown script." into gingerbreadJason parks2011-04-013-1/+92
| |\ \ \ \ \
| | * | | | | Implement teardown script.Jason parks2011-04-013-1/+92
* | | | | | | am 84d34078: Make the NFC UID forward compatible.Jeff Hamilton2011-04-041-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Make the NFC UID forward compatible.Jeff Hamilton2011-04-011-1/+1
| |/ / / / /
* | | | | | am cca2f2f9: Merge "Send out a broadcast that the system is being factory res...Jason parks2011-04-041-5/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Send out a broadcast that the system is being factory reset." into gin...Jason parks2011-03-301-5/+20
| |\ \ \ \ \
| | * | | | | Send out a broadcast that the system is beingJason parks2011-03-161-5/+20
| * | | | | | Fix Default route after secondary net use.Robert Greenwalt2011-03-262-0/+5
* | | | | | | am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findToke...Brad Fitzpatrick2011-04-041-2/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Always return a valid index from Rfc822Tokenizer.findTokenEnd()Mattias Niklewski2011-04-041-2/+2
* | | | | | | Fix bad merge.Robert Greenwalt2011-04-012-0/+5
* | | | | | | am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into ...Irfan Sheriff2011-03-301-0/+18
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbreadIrfan Sheriff2011-03-251-0/+18
| |\ \ \ \ \ \
| | * | | | | | DO NOT MERGE Pick upstream intf with valid IP confIrfan Sheriff2011-03-251-0/+18
* | | | | | | | am 568845a7: Merge "Fix some alt-network issues." into gingerbreadRobert Greenwalt2011-03-301-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fix some alt-network issues." into gingerbreadRobert Greenwalt2011-03-251-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Fix some alt-network issues.Robert Greenwalt2011-03-251-0/+3
* | | | | | | | | am 1e7fb7ae: Merge "Error in compound cache-control header."Brad Fitzpatrick2011-03-291-1/+7
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Error in compound cache-control header.Henrik Baard2011-03-291-1/+7