summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing sea...Conley Owens2011-04-291-1/+1
|\
| * 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
* | | am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()"Conley Owens2011-04-291-1/+1
|\ \ \ | |/ /
| * | Merge "Adding a sanity test in the while loop in readHistory()"Conley Owens2011-04-291-1/+1
| |\ \
| | * | Adding a sanity test in the while loop in readHistory()Per Andersson2011-02-211-1/+1
* | | | am e1787009: Merge "Added null check on return value for getKeyDispatcherStat...Conley Owens2011-04-281-0/+4
|\ \ \ \ | |/ / /
| * | | 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
* | | | | am e41d2aed: Merge "Using robust equality check."Conley Owens2011-04-281-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Using robust equality check."Conley Owens2011-04-281-1/+1
| |\ \ \ \
| | * | | | Using robust equality check.Jozef BABJAK2011-03-171-1/+1
* | | | | | am 1e29552b: Merge "We don\'t need these local references."Conley Owens2011-04-281-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | |/ / / /
* | | | | | am da882181: Merge "Eliminating dead code with no other effect than consuming...Conley Owens2011-04-281-3/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 a4e7353d: Import revised translations. DO NOT MERGEEric Fischer2011-04-273-12/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Import revised translations. DO NOT MERGEEric Fischer2011-04-273-12/+12
* | | | | | am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"Conley Owens2011-04-276-2/+190
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "onDetachedFromWindow is called before onAttachedToWindow"Conley Owens2011-04-276-2/+190
| |\ \ \ \ \
| | * | | | | onDetachedFromWindow is called before onAttachedToWindowMartin Wallgren2011-04-136-2/+190
* | | | | | | am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996Conley Owens2011-04-271-1/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge changes I0ab47e2f,Ib8016996Conley Owens2011-04-271-1/+0
| |\ \ \ \ \ \
| | * | | | | | Remove errant tag terminatorShachar Shemesh2011-04-111-1/+0
* | | | | | | | 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 71a556f2: Import revised translations. DO NOT MERGEEric Fischer2011-04-121-3/+3
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-04-121-3/+3
* | | | | | | am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."Kenny Root2011-04-1113-0/+297
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Runtime resource overlay, iteration 1."Kenny Root2011-04-1113-0/+297
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Runtime resource overlay, iteration 1.MÃ¥rten Kongstad2011-04-0113-0/+297
* | | | | | | 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 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2011-04-048-20/+18
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2011-03-308-20/+18
| |\ \ \ \ \ \
| | * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-03-298-20/+18
* | | | | | | | am cca2f2f9: Merge "Send out a broadcast that the system is being factory res...Jason parks2011-04-042-5/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Send out a broadcast that the system is being factory reset." into gin...Jason parks2011-03-302-5/+21
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Send out a broadcast that the system is beingJason parks2011-03-162-5/+21
| * | | | | | | Merge "Fix Default route after secondary net use." into gingerbreadRobert Greenwalt2011-03-262-0/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Fix Default route after secondary net use.Robert Greenwalt2011-03-262-0/+5
* | | | | | | | | am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"Brad Fitzpatrick2011-04-041-7/+13
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge "Fix data corruption when writing to Bluetooth socket"Brad Fitzpatrick2011-04-041-7/+13
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix data corruption when writing to Bluetooth socketMike Playle2011-04-041-7/+13
| | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findToke...Brad Fitzpatrick2011-04-042-2/+19
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /