summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | Merge "docs: add developer guide cross references, Project ACRE, round 3" int...Joe Fernandez2011-10-2815-20/+113
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | docs: add developer guide cross references, Project ACRE, round 3Joe Fernandez2011-10-2815-20/+113
* | | | | | | | | | | | am 76756a42: am c1cf3b16: Merge "Vertically center the landscape navigation b...Justin Ho2011-10-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am c1cf3b16: Merge "Vertically center the landscape navigation bar." into ics...Justin Ho2011-10-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "Vertically center the landscape navigation bar." into ics-mr0Justin Ho2011-10-281-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Vertically center the landscape navigation bar.Daniel Sandler2011-10-281-1/+1
* | | | | | | | | | | | am 4a6d0879: Merge "Add a flag for recommended suggestions of the spell check...satok2011-10-312-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Add a flag for recommended suggestions of the spell checker" into ics-mr1satok2011-10-282-0/+7
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add a flag for recommended suggestions of the spell checkersatok2011-10-282-0/+7
* | | | | | | | | | | | | am f0fd595f: Merge "Hide ime switcher when the screen is turned off." into ic...satok2011-10-311-9/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Hide ime switcher when the screen is turned off." into ics-mr1satok2011-10-281-9/+11
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Hide ime switcher when the screen is turned off.satok2011-10-281-9/+11
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | am 7801612b: Merge "Add some IO tests." into ics-mr1Dianne Hackborn2011-10-311-14/+215
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Add some IO tests." into ics-mr1Dianne Hackborn2011-10-281-14/+215
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add some IO tests.Dianne Hackborn2011-10-281-14/+215
* | | | | | | | | | | | | | am e02c88af: Work on process management.Dianne Hackborn2011-10-316-81/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Work on process management.Dianne Hackborn2011-10-286-81/+102
* | | | | | | | | | | | | | am 678ed0c5: Bug 5275928 - Don\'t try to open an overflow menu under invalid ...Adam Powell2011-10-312-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.Adam Powell2011-10-282-2/+7
* | | | | | | | | | | | | | Merge "Interpret '+' as a space char in the URL query params."Jesse Wilson2011-10-292-110/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Interpret '+' as a space char in the URL query params.Jesse Wilson2011-10-282-110/+17
* | | | | | | | | | | | | | | Merge "Fixing the build breakage due to bad merge."Svetoslav Ganov2011-10-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fixing the build breakage due to bad merge.Svetoslav Ganov2011-10-281-1/+1
* | | | | | | | | | | | | | | | resolved conflicts for merge of e10462e3 to masterPeter Ng2011-10-286-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Stat_notify visual asset updates" into ics-mr1Peter Ng2011-10-2812-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Stat_notify visual asset updatesPeter Ng2011-10-2812-0/+0
| | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | am 146d018f: Merge "Checkbox and radio button assets are sharper and blue" in...Peter Ng2011-10-28162-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "Checkbox and radio button assets are sharper and blue" into ics-mr1Peter Ng2011-10-28162-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Checkbox and radio button assets are sharper and bluePeter Ng2011-10-28162-0/+0
| | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | am d568bba5: Merge "Optimize handling of scrolled wallpapers" into ics-mr1Chet Haase2011-10-285-11/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | / / / / / / / / / / / / / | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge "Optimize handling of scrolled wallpapers" into ics-mr1Chet Haase2011-10-285-11/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Optimize handling of scrolled wallpapersChet Haase2011-10-285-11/+66
* | | | | | | | | | | | | | | | resolved conflicts for merge of c00d2ddc to masterSvetoslav Ganov2011-10-281-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "Fixing a memory leak in accessibility enteraction APIs." into ics-mr1Svetoslav Ganov2011-10-281-11/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fixing a memory leak in accessibility enteraction APIs.Svetoslav Ganov2011-10-281-11/+15
* | | | | | | | | | | | | | | | | am 220d2b0a: (-s ours) Merge "Import revised translations. DO NOT MERGE" int...Eric Fischer2011-10-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-10-289-18/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-10-289-18/+13
* | | | | | | | | | | | | | | | | | am a068e2f1: am 4eec98ed: Merge "Text handles do not handle scroll correctly"...Gilles Debunne2011-10-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 4eec98ed: Merge "Text handles do not handle scroll correctly" into ics-mr0Gilles Debunne2011-10-281-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge "Text handles do not handle scroll correctly" into ics-mr0Gilles Debunne2011-10-281-4/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Text handles do not handle scroll correctlyGilles Debunne2011-10-281-4/+5
* | | | | | | | | | | | | | | | | | am 58ba1b61: Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-10-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-10-280-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Revert "Clean up CursorWindow code."The Android Automerger2011-10-278-815/+858
| | | * | | | | | | | | | | | | | | Revert "Restore broken CursorWindow.getType behavior."The Android Automerger2011-10-271-4/+2
| | | * | | | | | | | | | | | | | | Revert "Clean up CursorWindow lifetime."The Android Automerger2011-10-2710-186/+582
| | | * | | | | | | | | | | | | | | Revert "Fix regression in CursorWindow.copyStingToBuffer."The Android Automerger2011-10-273-15/+7
| | | * | | | | | | | | | | | | | | Revert "Fix regression in CursorWindow.getString()"The Android Automerger2011-10-271-8/+2