summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"Brad Fitzpatrick2011-04-042-2/+19
| |\ \ \ \ \
| | * | | | | Always return a valid index from Rfc822Tokenizer.findTokenEnd()Mattias Niklewski2011-04-042-2/+19
| | |/ / / /
* | | | | | am e558a000: Merge "Avoid crash in system server when mounting container"Brad Fitzpatrick2011-04-041-0/+131
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Avoid crash in system server when mounting containerFredrik Helmer2011-04-041-0/+131
| |/ / / /
* | | | | Fix bad merge.Robert Greenwalt2011-04-012-0/+5
* | | | | am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbreadJeff Hamilton2011-03-301-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbreadJeff Hamilton2011-03-251-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Make STOP_APP_SWITCHES signatureOrSystem.Jeff Hamilton2011-03-251-1/+1
* | | | | 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
* | | | | | am 9c1ef098: Update the value for the NFC shared UID.Jeff Hamilton2011-03-241-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Update the value for the NFC shared UID.Jeff Hamilton2011-03-241-1/+1
| | |/ / / | |/| | |
* | | | | am f440831d: DO NOT MERGEHuahui Wu2011-03-242-2/+24
|\ \ \ \ \ | |/ / / /
| * | | | DO NOT MERGEHuahui Wu2011-03-232-2/+24
* | | | | am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerb...Simon Wilson2011-03-213-20/+38
|\ \ \ \ \ | |/ / / /
| * | | | Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbreadSimon Wilson2011-03-213-20/+38
| |\ \ \ \
| | * | | | DO NOT MERGE Change WiMAX indicator displayTK MUN2011-03-213-20/+38
* | | | | | am 661e9b37: Merge "remove the code that clears the passwords when the sim is...Fred Quintana2011-03-211-91/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "remove the code that clears the passwords when the sim is replaced wit...Fred Quintana2011-03-211-91/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | remove the code that clears the passwords when the simFred Quintana2011-03-071-91/+0
| | | |/ / | | |/| |
* | | | | am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2011-03-1841-428/+642
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2011-03-1841-428/+642
| |\ \ \ \
| | * | | | Import revised translations. DO NOT MERGEEric Fischer2011-03-1841-428/+642
* | | | | | am 125be9c8: Merge "Fixing a race condition in RecognitionService" into ginge...Valentin Kravtsov2011-03-181-2/+12
|\ \ \ \ \ \ | |/ / / / /