Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | Merge "docs: add developer guide cross references, Project ACRE, round 3" int... | Joe Fernandez | 2011-10-28 | 15 | -20/+113 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | docs: add developer guide cross references, Project ACRE, round 3 | Joe Fernandez | 2011-10-28 | 15 | -20/+113 | |
* | | | | | | | | | | | | am 76756a42: am c1cf3b16: Merge "Vertically center the landscape navigation b... | Justin Ho | 2011-10-31 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | am c1cf3b16: Merge "Vertically center the landscape navigation bar." into ics... | Justin Ho | 2011-10-29 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | Merge "Vertically center the landscape navigation bar." into ics-mr0 | Justin Ho | 2011-10-28 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | Vertically center the landscape navigation bar. | Daniel Sandler | 2011-10-28 | 1 | -1/+1 | |
* | | | | | | | | | | | | am 4a6d0879: Merge "Add a flag for recommended suggestions of the spell check... | satok | 2011-10-31 | 2 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge "Add a flag for recommended suggestions of the spell checker" into ics-mr1 | satok | 2011-10-28 | 2 | -0/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Add a flag for recommended suggestions of the spell checker | satok | 2011-10-28 | 2 | -0/+7 | |
* | | | | | | | | | | | | | am f0fd595f: Merge "Hide ime switcher when the screen is turned off." into ic... | satok | 2011-10-31 | 1 | -9/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge "Hide ime switcher when the screen is turned off." into ics-mr1 | satok | 2011-10-28 | 1 | -9/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Hide ime switcher when the screen is turned off. | satok | 2011-10-28 | 1 | -9/+11 | |
| | |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | am 7801612b: Merge "Add some IO tests." into ics-mr1 | Dianne Hackborn | 2011-10-31 | 1 | -14/+215 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Merge "Add some IO tests." into ics-mr1 | Dianne Hackborn | 2011-10-28 | 1 | -14/+215 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Add some IO tests. | Dianne Hackborn | 2011-10-28 | 1 | -14/+215 | |
* | | | | | | | | | | | | | | am e02c88af: Work on process management. | Dianne Hackborn | 2011-10-31 | 6 | -81/+102 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Work on process management. | Dianne Hackborn | 2011-10-28 | 6 | -81/+102 | |
* | | | | | | | | | | | | | | am 678ed0c5: Bug 5275928 - Don\'t try to open an overflow menu under invalid ... | Adam Powell | 2011-10-31 | 2 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Bug 5275928 - Don't try to open an overflow menu under invalid circumstances. | Adam Powell | 2011-10-28 | 2 | -2/+7 | |
* | | | | | | | | | | | | | | Merge "Interpret '+' as a space char in the URL query params." | Jesse Wilson | 2011-10-29 | 2 | -110/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Interpret '+' as a space char in the URL query params. | Jesse Wilson | 2011-10-28 | 2 | -110/+17 | |
* | | | | | | | | | | | | | | | Merge "Fixing the build breakage due to bad merge." | Svetoslav Ganov | 2011-10-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Fixing the build breakage due to bad merge. | Svetoslav Ganov | 2011-10-28 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | resolved conflicts for merge of e10462e3 to master | Peter Ng | 2011-10-28 | 6 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge "Stat_notify visual asset updates" into ics-mr1 | Peter Ng | 2011-10-28 | 12 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Stat_notify visual asset updates | Peter Ng | 2011-10-28 | 12 | -0/+0 | |
| | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | am 146d018f: Merge "Checkbox and radio button assets are sharper and blue" in... | Peter Ng | 2011-10-28 | 162 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge "Checkbox and radio button assets are sharper and blue" into ics-mr1 | Peter Ng | 2011-10-28 | 162 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Checkbox and radio button assets are sharper and blue | Peter Ng | 2011-10-28 | 162 | -0/+0 | |
| | |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | am d568bba5: Merge "Optimize handling of scrolled wallpapers" into ics-mr1 | Chet Haase | 2011-10-28 | 5 | -11/+66 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | / / / / / / / / / / / / / | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge "Optimize handling of scrolled wallpapers" into ics-mr1 | Chet Haase | 2011-10-28 | 5 | -11/+66 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | Optimize handling of scrolled wallpapers | Chet Haase | 2011-10-28 | 5 | -11/+66 | |
* | | | | | | | | | | | | | | | | resolved conflicts for merge of c00d2ddc to master | Svetoslav Ganov | 2011-10-28 | 1 | -8/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Merge "Fixing a memory leak in accessibility enteraction APIs." into ics-mr1 | Svetoslav Ganov | 2011-10-28 | 1 | -11/+15 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | Fixing a memory leak in accessibility enteraction APIs. | Svetoslav Ganov | 2011-10-28 | 1 | -11/+15 | |
* | | | | | | | | | | | | | | | | | am 220d2b0a: (-s ours) Merge "Import revised translations. DO NOT MERGE" int... | Eric Fischer | 2011-10-28 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1 | Eric Fischer | 2011-10-28 | 9 | -18/+13 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-10-28 | 9 | -18/+13 | |
* | | | | | | | | | | | | | | | | | | am a068e2f1: am 4eec98ed: Merge "Text handles do not handle scroll correctly"... | Gilles Debunne | 2011-10-28 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | am 4eec98ed: Merge "Text handles do not handle scroll correctly" into ics-mr0 | Gilles Debunne | 2011-10-28 | 1 | -4/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Merge "Text handles do not handle scroll correctly" into ics-mr0 | Gilles Debunne | 2011-10-28 | 1 | -4/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | Text handles do not handle scroll correctly | Gilles Debunne | 2011-10-28 | 1 | -4/+5 | |
* | | | | | | | | | | | | | | | | | | am 58ba1b61: Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-28 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | Reconcile with ics-mr0-release | The Android Open Source Project | 2011-10-28 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | merge in ics-mr0-release history after reset to ics-mr0 | The Android Automerger | 2011-10-28 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | Revert "Clean up CursorWindow code." | The Android Automerger | 2011-10-27 | 8 | -815/+858 | |
| | | * | | | | | | | | | | | | | | | Revert "Restore broken CursorWindow.getType behavior." | The Android Automerger | 2011-10-27 | 1 | -4/+2 | |
| | | * | | | | | | | | | | | | | | | Revert "Clean up CursorWindow lifetime." | The Android Automerger | 2011-10-27 | 10 | -186/+582 | |
| | | * | | | | | | | | | | | | | | | Revert "Fix regression in CursorWindow.copyStingToBuffer." | The Android Automerger | 2011-10-27 | 3 | -15/+7 | |
| | | * | | | | | | | | | | | | | | | Revert "Fix regression in CursorWindow.getString()" | The Android Automerger | 2011-10-27 | 1 | -8/+2 |