Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "resolved conflicts for merge of ca2b552d to master" | Jeff Brown | 2011-06-03 | 4 | -0/+30 |
|\ | |||||
| * | resolved conflicts for merge of ca2b552d to master | Jeff Brown | 2011-06-03 | 4 | -0/+30 |
| |\ | |||||
| | * | am c8812761: am e1718de6: Merge "Add a preference panel for mouse speed." int... | Jeff Brown | 2011-06-02 | 4 | -0/+30 |
| | |\ | |||||
| | | * | am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2 | Jeff Brown | 2011-06-02 | 4 | -0/+30 |
| | | |\ | |||||
| | | | * | Add a preference panel for mouse speed. | Jeff Brown | 2011-06-02 | 4 | -0/+30 |
* | | | | | Merge "Prevent WebKit updates in loadViewState case" | John Reck | 2011-06-03 | 2 | -26/+66 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Prevent WebKit updates in loadViewState case | John Reck | 2011-06-03 | 2 | -26/+66 |
* | | | | | Merge "resolved conflicts for merge of cc20b4e3 to master" | Dianne Hackborn | 2011-06-03 | 5 | -6/+54 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | resolved conflicts for merge of cc20b4e3 to master | Dianne Hackborn | 2011-06-03 | 5 | -6/+54 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | am a5f88510: am 2969b511: Merge "Add new supports-screen API to set maximum a... | Dianne Hackborn | 2011-06-01 | 5 | -6/+54 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | am 2969b511: Merge "Add new supports-screen API to set maximum allowed size."... | Dianne Hackborn | 2011-06-01 | 5 | -6/+54 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Add new supports-screen API to set maximum allowed size. | Dianne Hackborn | 2011-06-01 | 5 | -6/+54 |
* | | | | | Merge "Initial support for view state serialization" | John Reck | 2011-06-03 | 2 | -61/+190 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Initial support for view state serialization | John Reck | 2011-06-03 | 2 | -61/+190 |
* | | | | | am 3a80c504: am 8b9a2b6c: am e6676351: Work around OpenFeint bug. | Dianne Hackborn | 2011-06-03 | 4 | -8/+40 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | am 8b9a2b6c: am e6676351: Work around OpenFeint bug. | Dianne Hackborn | 2011-06-01 | 4 | -8/+40 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | am e6676351: Work around OpenFeint bug. | Dianne Hackborn | 2011-06-01 | 4 | -8/+40 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Work around OpenFeint bug. | Dianne Hackborn | 2011-06-01 | 4 | -8/+40 |
* | | | | | Merge "Fix default TextView gravity" | Fabrice Di Meglio | 2011-06-03 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix default TextView gravity | Fabrice Di Meglio | 2011-06-03 | 1 | -1/+1 |
* | | | | | | am b30dda6b: am 036c40f4: am fa8ee177: Merge "Framework: bugfix for menu sele... | Adam Powell | 2011-06-03 | 1 | -0/+1 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | am 036c40f4: am fa8ee177: Merge "Framework: bugfix for menu selector not show... | Adam Powell | 2011-06-01 | 1 | -0/+1 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | am fa8ee177: Merge "Framework: bugfix for menu selector not showing up proper... | Adam Powell | 2011-06-01 | 1 | -0/+1 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Merge "Framework: bugfix for menu selector not showing up properly." into hon... | Adam Powell | 2011-06-01 | 1 | -0/+1 |
| | | |\ \ \ | |||||
| | | | * | | | Framework: bugfix for menu selector not showing up properly. | Justin Koh | 2011-06-01 | 1 | -0/+1 |
* | | | | | | | am c11f6c3e: am 7cae137e: am 79841acb: Merge "Compatibility mode never needed... | Dianne Hackborn | 2011-06-03 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 7cae137e: am 79841acb: Merge "Compatibility mode never needed for normal s... | Dianne Hackborn | 2011-06-01 | 1 | -0/+3 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am 79841acb: Merge "Compatibility mode never needed for normal size screens."... | Dianne Hackborn | 2011-06-01 | 1 | -0/+3 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Merge "Compatibility mode never needed for normal size screens." into honeyco... | Dianne Hackborn | 2011-06-01 | 1 | -0/+3 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Compatibility mode never needed for normal size screens. | Dianne Hackborn | 2011-06-01 | 1 | -0/+3 |
* | | | | | | | | resolved conflicts for merge of b9e2f68b to master | Dianne Hackborn | 2011-06-03 | 1 | -7/+21 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 13e2bef4: am 80cf4e79: Merge "Fix issue #4500511: Holo effect background d... | Dianne Hackborn | 2011-06-01 | 1 | -7/+21 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | am 80cf4e79: Merge "Fix issue #4500511: Holo effect background doesn\'t reach... | Dianne Hackborn | 2011-06-01 | 1 | -7/+21 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Merge "Fix issue #4500511: Holo effect background doesn't reach top of screen... | Dianne Hackborn | 2011-06-01 | 1 | -7/+21 |
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | / / / | | | | |/ / / | | | |/| | | | |||||
| | | | * | | | Fix issue #4500511: Holo effect background doesn't reach top of screen anymore | Dianne Hackborn | 2011-06-01 | 1 | -7/+21 |
* | | | | | | | am d19fbe34: am ca234a07: am 8656ba12: Merge "Fix bug 4501658 - adjust toast ... | Adam Powell | 2011-06-03 | 6 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am ca234a07: am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding... | Adam Powell | 2011-06-01 | 6 | -0/+0 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeyc... | Adam Powell | 2011-06-01 | 6 | -0/+0 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2 | Adam Powell | 2011-06-01 | 6 | -0/+0 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | | * | | | Fix bug 4501658 - adjust toast frame padding | Adam Powell | 2011-05-31 | 6 | -0/+0 |
* | | | | | | | Merge "Response to code review for GridLayout:" | Philip Milne | 2011-06-03 | 3 | -251/+484 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Response to code review for GridLayout: | Philip Milne | 2011-06-03 | 3 | -251/+484 |
* | | | | | | | | am c691d7f9: am b8d10931: am fd206560: Merge "Forgot this file." into honeyco... | Dianne Hackborn | 2011-06-03 | 1 | -0/+20 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am b8d10931: am fd206560: Merge "Forgot this file." into honeycomb-mr2 | Dianne Hackborn | 2011-05-31 | 1 | -0/+20 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | am fd206560: Merge "Forgot this file." into honeycomb-mr2 | Dianne Hackborn | 2011-05-31 | 1 | -0/+20 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | Merge "Forgot this file." into honeycomb-mr2 | Dianne Hackborn | 2011-05-31 | 1 | -0/+20 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Forgot this file. | Dianne Hackborn | 2011-05-31 | 1 | -0/+20 |
* | | | | | | | | | am 7322e557: am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml r... | Dianne Hackborn | 2011-06-03 | 7 | -22/+43 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used... | Dianne Hackborn | 2011-05-31 | 7 | -22/+43 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescre... | Dianne Hackborn | 2011-05-31 | 7 | -22/+43 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / |