summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 267a6181 to honeycomb-LTEIrfan Sheriff2011-06-223-395/+3
|\
| * DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"Irfan Sheriff2011-06-213-395/+3
* | am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into h...Irfan Sheriff2011-06-211-18/+7
|\ \ | |/
| * DO NOT MERGE Revert "Fix lease duration handling"Irfan Sheriff2011-06-211-18/+7
* | Fix tethering upstream determination.Robert Greenwalt2011-06-202-11/+14
* | am 2f04883f: SDK only: integrate new sample code, deprecating along the way.Dianne Hackborn2011-06-164-2/+44
|\ \ | |/
| * SDK only: integrate new sample code, deprecating along the way.Dianne Hackborn2011-06-164-2/+44
* | Merge "Reset connections AFTER we take down the network." into honeycomb-LTERobert Greenwalt2011-06-161-41/+0
|\ \
| * | Reset connections AFTER we take down the network.Robert Greenwalt2011-06-161-41/+0
* | | Merge "Support SIM permanently disabled state." into honeycomb-LTEJohn Wang2011-06-161-0/+3
|\ \ \
| * | | Support SIM permanently disabled state.John Wang2011-06-141-0/+3
* | | | am 70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2Dianne Hackborn2011-06-151-0/+18
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "We must keep up with the Joneses." into honeycomb-mr2Dianne Hackborn2011-06-151-0/+18
| |\ \ \
| | * | | We must keep up with the Joneses.Dianne Hackborn2011-06-151-0/+18
* | | | | am 5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycom...Eric Fischer2011-06-1540-440/+360
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2Eric Fischer2011-06-1540-440/+360
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Import revised translations. DO NOT MERGEEric Fischer2011-06-1540-440/+360
* | | | | am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2Irfan Sheriff2011-06-151-7/+18
|\ \ \ \ \ | |/ / / /
| * | | | Fix lease duration handlingIrfan Sheriff2011-06-151-7/+18
| |/ / /
* | | | am f930232f: Fix a major problem in fragment lifecycle.Dianne Hackborn2011-06-142-10/+21
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Fix a major problem in fragment lifecycle.Dianne Hackborn2011-06-142-10/+21
* | | am 608a200d: Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2Amith Yamasani2011-06-141-2/+7
|\ \ \ | |/ /
| * | Merge "Stability fixes for PreferenceFragments." into honeycomb-mr2Amith Yamasani2011-06-141-2/+7
| |\ \
| | * | Stability fixes for PreferenceFragments.Amith Yamasani2011-06-141-2/+7
* | | | am 0a8a2324: Merge "Fix issue #4603422: Compatibility mode button doesn\'t al...Dianne Hackborn2011-06-142-3/+3
|\ \ \ \ | |/ / /
| * | | Fix issue #4603422: Compatibility mode button doesn't always updateDianne Hackborn2011-06-142-3/+3
| |/ /
* | | am c5193c62: Merge "Add new landscape and portrait orientation features." int...Dianne Hackborn2011-06-142-0/+40
|\ \ \ | |/ / | | / | |/ |/|
| * Add new landscape and portrait orientation features.Dianne Hackborn2011-06-142-0/+40
* | Update sim missing message in lock screen.John Wang2011-06-131-0/+2
* | am fd63814a: Merge "Fix some problems with moving in and out of detached stat...Dianne Hackborn2011-06-105-17/+107
|\ \ | |/
| * Merge "Fix some problems with moving in and out of detached state." into hone...Dianne Hackborn2011-06-105-17/+107
| |\
| | * Fix some problems with moving in and out of detached state.Dianne Hackborn2011-06-105-17/+107
| * | Fix layout issue on table when device thinks there's a SIM.Jim Miller2011-06-101-34/+35
* | | am 90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress vie...Teng-Hui Zhu2011-06-101-4/+6
|\ \ \ | |/ /
| * | Merge "fix one NPE when webChromeClient don't have progress view support" int...Teng-Hui Zhu2011-06-101-4/+6
| |\ \ | | |/ | |/|
| | * fix one NPE when webChromeClient don't have progress view supportTeng-Hui Zhu2011-06-101-4/+6
* | | am 2bb2d48f: Commit final (maybe) MR 2 API.Dianne Hackborn2011-06-091-45/+45
|\ \ \ | |/ /
| * | Commit final (maybe) MR 2 API.Dianne Hackborn2011-06-091-45/+45
| |/
* | am 220cd77d: Merge "Enforce public resource restriction on bag parents." into...Dianne Hackborn2011-06-092-2/+31
|\ \ | |/
| * Enforce public resource restriction on bag parents.Dianne Hackborn2011-06-092-2/+31
* | am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlar...Justin Ho2011-06-091-0/+0
|\ \ | |/
| * Updating default wallpaper of large devices to match xlargeJustin Ho2011-06-091-0/+0
* | am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into ...Dianne Hackborn2011-06-081-6/+10
|\ \ | |/
| * Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2Dianne Hackborn2011-06-081-6/+10
| |\
| | * Fix for not reporting correct "sw" in compat mode.Dianne Hackborn2011-06-081-6/+10
* | | am e22fe933: Fix issue #4582417: Need to add new PackageManager...Dianne Hackborn2011-06-081-0/+32
|\ \ \ | |/ /
| * | Fix issue #4582417: Need to add new PackageManager...Dianne Hackborn2011-06-081-0/+32
| |/
* | Merge "Set emergency call text visibility." into honeycomb-LTEJohn Wang2011-06-081-0/+13
|\ \
| * | Set emergency call text visibility.John Wang2011-06-081-0/+13
* | | am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces com...Dianne Hackborn2011-06-0813-90/+306
|\ \ \ | |/ / |/| / | |/